2 files changed, 11 insertions, 6 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 65dbcf65e6e..1084db34775 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-02-28  Andy Sawyer  <andy.sawyer@gmail.com>  (tiny change)
+
+        * saveplace.el (toggle-save-place):
+        Fix argument handling.  (Bug#16673)
+
 2014-02-28  Glenn Morris  <rgm@gnu.org>
 
         * minibuffer.el (completions-first-difference)
diff --git a/lisp/saveplace.el b/lisp/saveplace.el
index 6b234109512..a25dba2e39e 100644
--- a/lisp/saveplace.el
+++ b/lisp/saveplace.el
@@ -155,12 +155,12 @@ file:
   (if (not (or buffer-file-name (and (derived-mode-p 'dired-mode)
                                      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")
-          (setq save-place nil))
-      (message "Place will be saved")
-      (setq save-place t))))
+    (setq save-place (if parg
+                         (> (prefix-numeric-value parg) 0)
+                       (not save-place)))
+    (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))