procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* lisp/saveplace.el (save-place-local-mode): New minor mode

Browse source 
(toggle-save-place): Define as obsolete alias.
(save-place--setup-hooks): New function.
(save-place-mode): Use it.
This commit is contained in:
Stefan Monnier 2016-02-25 13:44:43 -05:00
parent 06a872b71d
commit fde0cd1adc
1 changed files with 26 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
lisp/saveplace.el
View file

@ -120,6 +120,25 @@ disabled, i.e., the position is recorded for all files."
(declare-function dired-current-directory "dired" (&optional localp)) (declare-function dired-current-directory "dired" (&optional localp))
(defun save-place--setup-hooks (add)
(cond
(add
(add-hook 'find-file-hook #'save-place-find-file-hook t)
(add-hook 'dired-initial-position-hook #'save-place-dired-hook)
(unless noninteractive
(add-hook 'kill-emacs-hook #'save-place-kill-emacs-hook))
(add-hook 'kill-buffer-hook #'save-place-to-alist))
(t
;; We should remove the hooks, but only if save-place-mode
;; is nil everywhere. Is it worth the trouble, tho?
;; (unless (or (default-value 'save-place-mode)
;; (cl-some <save-place-local-mode-p> (buffer-list)))
;; (remove-hook 'find-file-hook #'save-place-find-file-hook)
;; (remove-hook 'dired-initial-position-hook #'save-place-dired-hook)
;; (remove-hook 'kill-emacs-hook #'save-place-kill-emacs-hook)
;; (remove-hook 'kill-buffer-hook #'save-place-to-alist))
)))
(define-obsolete-variable-alias 'save-place 'save-place-mode "25.1") (define-obsolete-variable-alias 'save-place 'save-place-mode "25.1")
;;;###autoload ;;;###autoload
(define-minor-mode save-place-mode (define-minor-mode save-place-mode
@ -128,23 +147,14 @@ This means when you visit a file, point goes to the last place
where it was when you previously visited the same file." where it was when you previously visited the same file."
:global t :global t
:group 'save-place :group 'save-place
(cond (save-place--setup-hooks save-place-mode))
(save-place-mode
(add-hook 'find-file-hook 'save-place-find-file-hook t)
(add-hook 'dired-initial-position-hook 'save-place-dired-hook)
(unless noninteractive
(add-hook 'kill-emacs-hook 'save-place-kill-emacs-hook))
(add-hook 'kill-buffer-hook 'save-place-to-alist))
(t
(remove-hook 'find-file-hook 'save-place-find-file-hook t)
(remove-hook 'dired-initial-position-hook 'save-place-dired-hook)
(remove-hook 'kill-emacs-hook 'save-place-kill-emacs-hook)
(remove-hook 'kill-buffer-hook 'save-place-to-alist))))
(make-variable-buffer-local 'save-place-mode) ; Hysterical raisins. (make-variable-buffer-local 'save-place-mode)
(define-obsolete-function-alias 'toggle-save-place
#'save-place-local-mode "25.1")
;;;###autoload ;;;###autoload
(defun toggle-save-place (&optional parg) ;FIXME: save-place-local-mode! (define-minor-mode save-place-local-mode
"Toggle whether to save your place in this file between sessions. "Toggle whether to save your place in this file between sessions.
If this mode is enabled, point is recorded when you kill the buffer If this mode is enabled, point is recorded when you kill the buffer
or exit Emacs. Visiting this file again will go to that position, or exit Emacs. Visiting this file again will go to that position,
@ -157,30 +167,13 @@ To save places automatically in all files, put this in your init
file: file:
\(save-place-mode 1)" \(save-place-mode 1)"
(interactive "P") :variable save-place-mode
(if (not (or buffer-file-name (and (derived-mode-p 'dired-mode) (if (not (or buffer-file-name (and (derived-mode-p 'dired-mode)
(boundp 'dired-subdir-alist) (boundp 'dired-subdir-alist)
dired-subdir-alist dired-subdir-alist
(dired-current-directory)))) (dired-current-directory))))
(message "Buffer `%s' not visiting a file or directory" (buffer-name)) (message "Buffer `%s' not visiting a file or directory" (buffer-name))
(setq save-place (if parg (save-place--setup-hooks save-place-mode)))
(> (prefix-numeric-value parg) 0)
(not save-place)))
(cond
(save-place
(add-hook 'find-file-hook 'save-place-find-file-hook t)
(add-hook 'dired-initial-position-hook 'save-place-dired-hook)
(unless noninteractive
(add-hook 'kill-emacs-hook 'save-place-kill-emacs-hook))
(add-hook 'kill-buffer-hook 'save-place-to-alist))
(t
(remove-hook 'find-file-hook 'save-place-find-file-hook t)
(remove-hook 'dired-initial-position-hook 'save-place-dired-hook)
(remove-hook 'kill-emacs-hook 'save-place-kill-emacs-hook)
(remove-hook 'kill-buffer-hook 'save-place-to-alist)))
(message (if save-place
"Place will be saved"
"No place will be saved in this file"))))
(declare-function dired-get-filename "dired" (&optional localp no-error-if-not-filep)) (declare-function dired-get-filename "dired" (&optional localp no-error-if-not-filep))