lisp/gnus/gnus-setup.el (gnus-use-sendmail): We never use sendmail for mail reading

[gnu-emacs] / lisp / saveplace.el

diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 1b7efcec1b9a8585161569a8e576d25216d33263..f77a438473fe5c03c68df5fd10ee7f1ececc74e8 100644 (file)
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -1,6 +1,6 @@
 ;;; saveplace.el --- automatically save place in files
 
-;; Copyright (C) 1993-1994, 2001-2013 Free Software Foundation, Inc.
+;; Copyright (C) 1993-1994, 2001-2014 Free Software Foundation, Inc.
 
 ;; Author: Karl Fogel <kfogel@red-bean.com>
 ;; Maintainer: FSF
@@ -152,8 +152,8 @@ file:
 
 \(setq-default save-place t\)"
   (interactive "P")
-  (if (not buffer-file-name)
-      (message "Buffer `%s' not visiting a file" (buffer-name))
+  (if (not (or buffer-file-name dired-directory))
+      (message "Buffer `%s' not visiting a file or directory" (buffer-name))
     (if (and save-place (or (not parg) (<= parg 0)))
        (progn
          (message "No place will be saved in this file")
@@ -161,6 +161,8 @@ file:
       (message "Place will be saved")
       (setq save-place t))))
 
+(declare-function dired-get-filename "dired" (&optional localp no-error-if-not-filep))
+
 (defun save-place-to-alist ()
   ;; put filename and point in a cons box and then cons that onto the
   ;; front of the save-place-alist, if save-place is non-nil.
@@ -169,22 +171,33 @@ file:
   ;; file.  If not, do so, then feel free to modify the alist.  It
   ;; will be saved again when Emacs is killed.
   (or save-place-loaded (load-save-place-alist-from-file))
-  (when (and buffer-file-name
-            (or (not save-place-ignore-files-regexp)
-                (not (string-match save-place-ignore-files-regexp
-                                   buffer-file-name))))
-    (let ((cell (assoc buffer-file-name save-place-alist))
-         (position (if (not (eq major-mode 'hexl-mode))
-                       (point)
-                     (with-no-warnings
-                       (1+ (hexl-current-address))))))
-      (if cell
-         (setq save-place-alist (delq cell save-place-alist)))
-      (if (and save-place
-              (not (= position 1)))  ;; Optimize out the degenerate case.
-         (setq save-place-alist
-               (cons (cons buffer-file-name position)
-                     save-place-alist))))))
+  (let ((item (or buffer-file-name
+                  (and dired-directory
+                      (if (consp dired-directory)
+                          (expand-file-name (car dired-directory))
+                        (expand-file-name dired-directory))))))
+    (when (and item
+               (or (not save-place-ignore-files-regexp)
+                   (not (string-match save-place-ignore-files-regexp
+                                      item))))
+      (let ((cell (assoc item save-place-alist))
+            (position (cond ((eq major-mode 'hexl-mode)
+                            (with-no-warnings
+                              (1+ (hexl-current-address))))
+                           (dired-directory
+                            (let ((filename (dired-get-filename nil t)))
+                              (if filename
+                                  `((dired-filename . ,filename))
+                                (point))))
+                           (t (point)))))
+        (if cell
+            (setq save-place-alist (delq cell save-place-alist)))
+        (if (and save-place
+                 (not (and (integerp position)
+                          (= position 1)))) ;; Optimize out the degenerate case.
+            (setq save-place-alist
+                  (cons (cons item position)
+                        save-place-alist)))))))
 
 (defun save-place-forget-unreadable-files ()
   "Remove unreadable files from `save-place-alist'.
@@ -253,8 +266,9 @@ may have changed\) back to `save-place-alist'."
                 (insert-file-contents file)
                 (goto-char (point-min))
                 (setq save-place-alist
-                      (car (read-from-string
-                            (buffer-substring (point-min) (point-max)))))
+                      (with-demoted-errors "Error reading save-place-file: %S"
+                        (car (read-from-string
+                              (buffer-substring (point-min) (point-max))))))
 
                 ;; If there is a limit, and we're over it, then we'll
                 ;; have to truncate the end of the list:
@@ -287,7 +301,8 @@ may have changed\) back to `save-place-alist'."
       (with-current-buffer (car buf-list)
        ;; save-place checks buffer-file-name too, but we can avoid
        ;; overhead of function call by checking here too.
-       (and buffer-file-name (save-place-to-alist))
+       (and (or buffer-file-name dired-directory)
+            (save-place-to-alist))
        (setq buf-list (cdr buf-list))))))
 
 (defun save-place-find-file-hook ()
@@ -296,7 +311,27 @@ may have changed\) back to `save-place-alist'."
     (if cell
        (progn
          (or revert-buffer-in-progress-p
-             (goto-char (cdr cell)))
+             (and (integerp (cdr cell))
+                  (goto-char (cdr cell))))
+          ;; and make sure it will be saved again for later
+          (setq save-place t)))))
+
+(declare-function dired-goto-file "dired" (file))
+
+(defun save-place-dired-hook ()
+  "Position the point in a dired buffer."
+  (or save-place-loaded (load-save-place-alist-from-file))
+  (let ((cell (assoc (if (consp dired-directory)
+                        (expand-file-name (car dired-directory))
+                      (expand-file-name dired-directory))
+                    save-place-alist)))
+    (if cell
+        (progn
+          (or revert-buffer-in-progress-p
+              (if (integerp (cdr cell))
+                 (goto-char (cdr cell))
+               (and (assq 'dired-filename (cdr cell))
+                    (dired-goto-file (cdr (assq 'dired-filename (cdr cell)))))))
           ;; and make sure it will be saved again for later
           (setq save-place t)))))
 
@@ -310,6 +345,8 @@ may have changed\) back to `save-place-alist'."
 
 (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))