Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-6

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-48
 - miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-51
   Update from CVS

8 files changed, 180 insertions, 182 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0be81220340..c70fd38ecd7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,49 @@
+2005-01-24  Jay Belanger  <belanger@truman.edu>
+
+        * calc/calc-store.el (calc-declare-variable): Use calc-var-name to
+        display variable name.
+
+2005-01-24  Kenichi Handa  <handa@m17n.org>
+
+        * international/encoded-kb.el (encoded-kbd-iso2022-single-shift):
+        Fix setting of the element of encoded-kbd-iso2022-invocations.
+
+2005-01-24  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-goto-breakpoint, gdb-frames-select)
+        (gdb-threads-select): Change to also accept mouse events.
+        (gdb-mouse-goto-breakpoint, gdb-frames-mouse-select)
+        (gdb-threads-mouse-select): Delete.
+
+2005-01-23  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * files.el (insert-directory): Take care of empty directory,
+        listed without -a switch.
+
+2005-01-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * textmodes/refill.el (refill-post-command-function):
+        Add `indent-new-comment-line' and `reindent-then-newline-and-indent'
+        to the list of functions that we should be careful not to undo.
+        (refill-late-fill-paragraph-function): Remove.
+        (refill-saved-state): New var.
+        (refill-mode): Use it to save fill-paragraph-function.
+        Save also the value of auto-fill-function.
+
+        * term/w32-win.el: Simplify code.
+
+2005-01-23  Kim F. Storm  <storm@cua.dk>
+
+        * simple.el (line-move): Adapt to new return value from
+        pos-visible-in-window-p.
+
+        * simple.el (line-move): Fix last change.  Check partial
+        visibility at point rather than at window-start.
+
+2005-01-22  Jason Rumney  <jasonr@gnu.org>
+
+        * term/w32-win.el (xw-defined-colors): Remove debug-message.
+
 2005-01-22  David Kastrup  <dak@gnu.org>
 
         * progmodes/grep.el: Add alias `find-grep' for `grep-find'.
diff --git a/lisp/calc/calc-store.el b/lisp/calc/calc-store.el
index b2cef4936a0..52f0cc0272d 100644
--- a/lisp/calc/calc-store.el
+++ b/lisp/calc/calc-store.el
@@ -482,7 +482,7 @@
                              (setq rp nil)))
                        (not rp)))))
      (calc-unread-command ?\C-a)
-     (setq decl (read-string (format "Declare: %s  to be: " var)
+     (setq decl (read-string (format "Declare: %s  to be: " (calc-var-name var))
                              (and rp
                                   (math-format-flat-expr (nth 2 (car dp)) 0))))
      (setq decl (and (string-match "[^ \t]" decl)
diff --git a/lisp/files.el b/lisp/files.el
index cdaa7a5adb8..841332b957a 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -4550,45 +4550,54 @@ normally equivalent short `-D' option is just passed on to
           (when (if (stringp switches)
                     (string-match "--dired\\>" switches)
                   (member "--dired" switches))
+            ;; The following overshoots by one line for an empty
+            ;; directory listed with "--dired", but without "-a"
+            ;; switch, where the ls output contains a
+            ;; "//DIRED-OPTIONS//" line, but no "//DIRED//" line.
+            ;; We take care of that case later.
             (forward-line -2)
             (when (looking-at "//SUBDIRED//")
               (delete-region (point) (progn (forward-line 1) (point)))
               (forward-line -1))
-            (when (looking-at "//DIRED//")
-              (let ((end (line-end-position))
-                    (linebeg (point))
-                    error-lines)
-                ;; Find all the lines that are error messages,
-                ;; and record the bounds of each one.
-                (goto-char beg)
-                (while (< (point) linebeg)
-                  (or (eql (following-char) ?\s)
-                      (push (list (point) (line-end-position)) error-lines))
-                  (forward-line 1))
-                (setq error-lines (nreverse error-lines))
-                ;; Now read the numeric positions of file names.
-                (goto-char linebeg)
-                (forward-word 1)
-                (forward-char 3)
-                (while (< (point) end)
-                  (let ((start (insert-directory-adj-pos
+            (if (looking-at "//DIRED//")
+                (let ((end (line-end-position))
+                      (linebeg (point))
+                      error-lines)
+                  ;; Find all the lines that are error messages,
+                  ;; and record the bounds of each one.
+                  (goto-char beg)
+                  (while (< (point) linebeg)
+                    (or (eql (following-char) ?\s)
+                        (push (list (point) (line-end-position)) error-lines))
+                    (forward-line 1))
+                  (setq error-lines (nreverse error-lines))
+                  ;; Now read the numeric positions of file names.
+                  (goto-char linebeg)
+                  (forward-word 1)
+                  (forward-char 3)
+                  (while (< (point) end)
+                    (let ((start (insert-directory-adj-pos
+                                  (+ beg (read (current-buffer)))
+                                  error-lines))
+                          (end (insert-directory-adj-pos
                                 (+ beg (read (current-buffer)))
-                                error-lines))
-                        (end (insert-directory-adj-pos
-                              (+ beg (read (current-buffer)))
-                              error-lines)))
-                    (if (memq (char-after end) '(?\n ?\ ))
-                        ;; End is followed by \n or by " -> ".
-                        (put-text-property start end 'dired-filename t)
-                      ;; It seems that we can't trust ls's output as to
-                      ;; byte positions of filenames.
-                      (put-text-property beg (point) 'dired-filename nil)
-                      (end-of-line))))
-                (goto-char end)
-                (beginning-of-line)
-                (delete-region (point) (progn (forward-line 1) (point))))
-              (if (looking-at "//DIRED-OPTIONS//")
-                  (delete-region (point) (progn (forward-line 1) (point))))))
+                                error-lines)))
+                      (if (memq (char-after end) '(?\n ?\ ))
+                          ;; End is followed by \n or by " -> ".
+                          (put-text-property start end 'dired-filename t)
+                        ;; It seems that we can't trust ls's output as to
+                        ;; byte positions of filenames.
+                        (put-text-property beg (point) 'dired-filename nil)
+                        (end-of-line))))
+                  (goto-char end)
+                  (beginning-of-line)
+                  (delete-region (point) (progn (forward-line 1) (point))))
+              ;; Take care of the case where the ls output contains a
+              ;; "//DIRED-OPTIONS//"-line, but no "//DIRED//"-line
+              ;; and we went one line too far back (see above).
+              (forward-line 1))
+            (if (looking-at "//DIRED-OPTIONS//")
+                (delete-region (point) (progn (forward-line 1) (point)))))
 
           ;; Now decode what read if necessary.
           (let ((coding (or coding-system-for-read
diff --git a/lisp/international/encoded-kb.el b/lisp/international/encoded-kb.el
index ad80baecf76..d5452c92c43 100644
--- a/lisp/international/encoded-kb.el
+++ b/lisp/international/encoded-kb.el
@@ -130,9 +130,7 @@ The following key sequence may cause multilingual text insertion."
 
 (defun encoded-kbd-iso2022-single-shift (ignore)
   (let ((char (encoded-kbd-last-key)))
-    (aset encoded-kbd-iso2022-invocations 2
-          (aref encoded-kbd-iso2022-designations
-                (if (= char ?\216) 2 3))))
+    (aset encoded-kbd-iso2022-invocations 2 (if (= char ?\216) 2 3)))
   "")
 
 (defun encoded-kbd-self-insert-iso2022-7bit (ignore)
diff --git a/lisp/progmodes/gdb-ui.el b/lisp/progmodes/gdb-ui.el
index 993d440cd0c..1827589387e 100644
--- a/lisp/progmodes/gdb-ui.el
+++ b/lisp/progmodes/gdb-ui.el
@@ -1243,7 +1243,7 @@ static char *magick[] = {
     (define-key map "d" 'gdb-delete-breakpoint)
     (define-key map "q" 'kill-this-buffer)
     (define-key map "\r" 'gdb-goto-breakpoint)
-    (define-key map [mouse-2] 'gdb-mouse-goto-breakpoint)
+    (define-key map [mouse-2] 'gdb-goto-breakpoint)
     map))
 
 (defun gdb-breakpoints-mode ()
@@ -1291,9 +1291,10 @@ static char *magick[] = {
         (concat gdb-server-prefix "delete " (match-string 1) "\n") 'ignore))
     (error "Not recognized as break/watchpoint line")))
 
-(defun gdb-goto-breakpoint ()
+(defun gdb-goto-breakpoint (&optional event)
   "Display the breakpoint location specified at current line."
-  (interactive)
+  (interactive (list last-input-event))
+  (if event (mouse-set-point event))
   (save-excursion
     (beginning-of-line 1)
     (if (if (with-current-buffer gud-comint-buffer (eq gud-minor-mode 'gdba))
@@ -1311,14 +1312,8 @@ static char *magick[] = {
                 (goto-line (string-to-number line))
                 (set-window-point window (point))))))
       (error "Not recognized as break/watchpoint line"))))
-
-(defun gdb-mouse-goto-breakpoint (event)
-  "Display the breakpoint location that you click on."
-  (interactive "e")
-  (mouse-set-point event)
-  (gdb-goto-breakpoint))
 
-;;
+
 ;; Frames buffer.  This displays a perpetually correct bactracktrace
 ;; (from the command `where').
 ;;
@@ -1372,7 +1367,7 @@ static char *magick[] = {
     (suppress-keymap map)
     (define-key map "q" 'kill-this-buffer)
     (define-key map "\r" 'gdb-frames-select)
-    (define-key map [mouse-2] 'gdb-frames-mouse-select)
+    (define-key map [mouse-2] 'gdb-frames-select)
     map))
 
 (defun gdb-frames-mode ()
@@ -1396,20 +1391,15 @@ static char *magick[] = {
            (n (or (and pos (match-string-no-properties 1)) "0")))
       n)))
 
-(defun gdb-frames-select ()
+(defun gdb-frames-select (&optional event)
   "Select the frame and display the relevant source."
-  (interactive)
+  (interactive (list last-input-event))
+  (if event (mouse-set-point event))
   (gdb-enqueue-input
    (list (concat gdb-server-prefix "frame " (gdb-get-frame-number) "\n") 'ignore))
   (gud-display-frame))
-
-(defun gdb-frames-mouse-select (event)
-  "Select the frame you click on and display the relevant source."
-  (interactive "e")
-  (mouse-set-point event)
-  (gdb-frames-select))
 
-;;
+
 ;; Threads buffer.  This displays a selectable thread list.
 ;;
 (gdb-set-buffer-rules 'gdb-threads-buffer
@@ -1454,7 +1444,7 @@ static char *magick[] = {
     (suppress-keymap map)
     (define-key map "q" 'kill-this-buffer)
     (define-key map "\r" 'gdb-threads-select)
-    (define-key map [mouse-2] 'gdb-threads-mouse-select)
+    (define-key map [mouse-2] 'gdb-threads-select)
     map))
 
 (defun gdb-threads-mode ()
@@ -1474,20 +1464,15 @@ static char *magick[] = {
     (re-search-backward "^\\s-*\\([0-9]*\\)" nil t)
     (match-string-no-properties 1)))
 
-(defun gdb-threads-select ()
+(defun gdb-threads-select (&optional event)
   "Select the thread and display the relevant source."
-  (interactive)
+  (interactive (list last-input-event))
+  (if event (mouse-set-point event))
   (gdb-enqueue-input
    (list (concat "thread " (gdb-get-thread-number) "\n") 'ignore))
   (gud-display-frame))
-
-(defun gdb-threads-mouse-select (event)
-  "Select the thread you click on and display the relevant source."
-  (interactive "e")
-  (mouse-set-point event)
-  (gdb-threads-select))
 
-;;
+
 ;; Registers buffer.
 ;;
 (gdb-set-buffer-rules 'gdb-registers-buffer
diff --git a/lisp/simple.el b/lisp/simple.el
index c54c67ea8ac..db7ae23bf41 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -3183,17 +3183,17 @@ Outline mode sets this."
 (defun line-move (arg &optional noerror to-end)
   (if auto-window-vscroll
       (let ((forward (> arg 0))
-            (pvis (pos-visible-in-window-p (window-start) nil t)))
-        (if (and pvis (null (nth 2 pvis))
-                 (> (nth (if forward 4 3) pvis) 0))
+            (part (nth 2 (pos-visible-in-window-p (point) nil t))))
+        (if (and (consp part)
+                 (> (setq part (if forward (cdr part) (car part))) 0))
             (set-window-vscroll nil
                                 (if forward
                                     (+ (window-vscroll nil t)
-                                       (min (nth 4 pvis)
+                                       (min part
                                             (* (frame-char-height) arg)))
                                   (max 0
                                        (- (window-vscroll nil t)
-                                          (min (nth 3 pvis)
+                                          (min part
                                                (* (frame-char-height) (- arg))))))
                                 t)
           (set-window-vscroll nil 0)
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index b2f2269c558..4646e54b4a0 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -1,6 +1,6 @@
 ;;; w32-win.el --- parse switches controlling interface with W32 window system
 
-;; Copyright (C) 1993, 1994, 2003, 2004 Free Software Foundation, Inc.
+;; Copyright (C) 1993, 1994, 2003, 2004, 2005  Free Software Foundation, Inc.
 
 ;; Author: Kevin Gallo
 ;; Keywords: terminals
@@ -139,50 +139,26 @@ the last file dropped is selected."
   "Handle SWITCH of the form \"-switch value\" or \"-switch\"."
   (let ((aelt (assoc switch command-line-x-option-alist)))
     (if aelt
-        (let ((param (nth 3 aelt))
-              (value (nth 4 aelt)))
-          (if value
-              (setq default-frame-alist
-                    (cons (cons param value)
-                          default-frame-alist))
-            (setq default-frame-alist
-                  (cons (cons param
-                              (car x-invocation-args))
-                        default-frame-alist)
-                  x-invocation-args (cdr x-invocation-args)))))))
+        (push (cons (nth 3 aelt) (or (nth 4 aelt) (pop x-invocation-args)))
+              default-frame-alist))))
 
 (defun x-handle-numeric-switch (switch)
   "Handle SWITCH of the form \"-switch n\"."
   (let ((aelt (assoc switch command-line-x-option-alist)))
     (if aelt
-        (let ((param (nth 3 aelt)))
-        (setq default-frame-alist
-              (cons (cons param
-                          (string-to-int (car x-invocation-args)))
-                    default-frame-alist)
-              x-invocation-args
-              (cdr x-invocation-args))))))
+        (push (cons (nth 3 aelt) (string-to-int (pop x-invocation-args)))
+              default-frame-alist))))
 
 ;; Handle options that apply to initial frame only
 (defun x-handle-initial-switch (switch)
   (let ((aelt (assoc switch command-line-x-option-alist)))
     (if aelt
-        (let ((param (nth 3 aelt))
-              (value (nth 4 aelt)))
-          (if value
-              (setq initial-frame-alist
-                    (cons (cons param value)
-                          initial-frame-alist))
-            (setq initial-frame-alist
-                  (cons (cons param
-                              (car x-invocation-args))
-                        initial-frame-alist)
-                  x-invocation-args (cdr x-invocation-args)))))))
+        (push (cons (nth 3 aelt) (or (nth 4 aelt) (pop x-invocation-args)))
+              initial-frame-alist))))
 
 (defun x-handle-iconic (switch)
   "Make \"-iconic\" SWITCH apply only to the initial frame."
-  (setq initial-frame-alist
-        (cons '(visibility . icon) initial-frame-alist)))
+  (push '(visibility . icon) initial-frame-alist))
 
 (defun x-handle-xrm-switch (switch)
   "Handle the \"-xrm\" SWITCH."
@@ -226,18 +202,15 @@ the last file dropped is selected."
 ;; to the option's operand; set the name of the initial frame, too.
   (or (consp x-invocation-args)
       (error "%s: missing argument to `%s' option" (invocation-name) switch))
-  (setq x-resource-name (car x-invocation-args)
-        x-invocation-args (cdr x-invocation-args))
-  (setq initial-frame-alist (cons (cons 'name x-resource-name)
-                                  initial-frame-alist)))
+  (setq x-resource-name (pop x-invocation-args))
+  (push (cons 'name x-resource-name) initial-frame-alist))
 
 (defvar x-display-name nil
   "The display name specifying server and frame.")
 
 (defun x-handle-display (switch)
   "Handle the \"-display\" SWITCH."
-  (setq x-display-name (car x-invocation-args)
-        x-invocation-args (cdr x-invocation-args)))
+  (setq x-display-name (pop x-invocation-args)))
 
 (defun x-handle-args (args)
   "Process the X-related command line options in ARGS.
@@ -281,7 +254,7 @@ This returns ARGS with the arguments that have been processed removed."
                      (cons argval x-invocation-args)))
                 (funcall handler this-switch))
             (funcall handler this-switch))
-        (setq args (cons orig-this-switch args)))))
+        (push orig-this-switch args))))
   (nconc (nreverse args) x-invocation-args))
 
 ;;
@@ -1046,16 +1019,10 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
 (defun xw-defined-colors (&optional frame)
   "Internal function called by `defined-colors', which see."
   (or frame (setq frame (selected-frame)))
-  (let* ((color-map-colors (mapcar (lambda (clr) (car clr)) w32-color-map))
-         (all-colors (or color-map-colors x-colors))
-         (this-color nil)
-         (defined-colors nil))
-    (message "Defining colors...")
-    (while all-colors
-      (setq this-color (car all-colors)
-            all-colors (cdr all-colors))
+  (let ((defined-colors nil))
+    (dolist (this-color (or (mapcar 'car w32-color-map) x-colors))
       (and (color-supported-p this-color frame t)
-           (setq defined-colors (cons this-color defined-colors))))
+           (push this-color defined-colors)))
     defined-colors))
 
 
@@ -1077,13 +1044,10 @@ XConsortium: rgb.txt,v 10.41 94/02/20 18:39:36 rws Exp")
 
 ;;; Make sure we have a valid resource name.
 (or (stringp x-resource-name)
-    (let (i)
-      (setq x-resource-name (invocation-name))
-
-      ;; Change any . or * characters in x-resource-name to hyphens,
-      ;; so as not to choke when we use it in X resource queries.
-      (while (setq i (string-match "[.*]" x-resource-name))
-        (aset x-resource-name i ?-))))
+    (setq x-resource-name
+          ;; Change any . or * characters in x-resource-name to hyphens,
+          ;; so as not to choke when we use it in X resource queries.
+          (replace-regexp-in-string "[.*]" "-" (invocation-name))))
 
 ;; For the benefit of older Emacses (19.27 and earlier) that are sharing
 ;; the same lisp directory, don't pass the third argument unless we seem
@@ -1167,21 +1131,17 @@ See the documentation of `create-fontset-from-fontset-spec for the format.")
         (setq initial-frame-alist (append initial-frame-alist parsed))
         ;; The size parms apply to all frames.
         (if (assq 'height parsed)
-            (setq default-frame-alist
-                  (cons (cons 'height (cdr (assq 'height parsed)))
-                        default-frame-alist)))
+            (push (cons 'height (cdr (assq 'height parsed)))
+                  default-frame-alist))
         (if (assq 'width parsed)
-            (setq default-frame-alist
-                  (cons (cons 'width (cdr (assq 'width parsed)))
-                        default-frame-alist))))))
+            (push (cons 'width (cdr (assq 'width parsed)))
+                  default-frame-alist)))))
 
 ;; Check the reverseVideo resource.
 (let ((case-fold-search t))
   (let ((rv (x-get-resource "reverseVideo" "ReverseVideo")))
-    (if (and rv
-             (string-match "^\\(true\\|yes\\|on\\)$" rv))
-        (setq default-frame-alist
-              (cons '(reverse . t) default-frame-alist)))))
+    (if (and rv (string-match "^\\(true\\|yes\\|on\\)$" rv))
+        (push '(reverse . t) default-frame-alist))))
 
 (defun x-win-suspend-error ()
   "Report an error when a suspend is attempted."
@@ -1245,7 +1205,7 @@ font dialog to get the matching FONTS. Otherwise use a pop-up menu
          (and chosen-font (list chosen-font)))
      (x-popup-menu
       last-nonmenu-event
-    ;; Append list of fontsets currently defined.
+      ;; Append list of fontsets currently defined.
       ;; Conditional on new-fontset so bootstrapping works on non-GUI compiles
       (if (fboundp 'new-fontset)
       (append w32-fixed-font-alist (list (generate-fontset-menu)))))))
@@ -1269,5 +1229,5 @@ font dialog to get the matching FONTS. Otherwise use a pop-up menu
         (tiff "libtiff3.dll" "libtiff.dll")
         (gif "libungif.dll")))
 
-;;; arch-tag: 69fb1701-28c2-4890-b351-3d1fe4b4f166
+;; arch-tag: 69fb1701-28c2-4890-b351-3d1fe4b4f166
 ;;; w32-win.el ends here
diff --git a/lisp/textmodes/refill.el b/lisp/textmodes/refill.el
index 60b64e9a9f2..9979f4a3e27 100644
--- a/lisp/textmodes/refill.el
+++ b/lisp/textmodes/refill.el
@@ -1,6 +1,6 @@
 ;;; refill.el --- `auto-fill' by refilling paragraphs on changes
 
-;; Copyright (C) 2000, 2003  Free Software Foundation, Inc.
+;; Copyright (C) 2000, 2003, 2005  Free Software Foundation, Inc.
 
 ;; Author: Dave Love <fx@gnu.org>
 ;; Maintainer: Miles Bader <miles@gnu.org>
@@ -85,6 +85,8 @@
 
 ;;; Code:
 
+(eval-when-compile (require 'cl))
+
 (defgroup refill nil
   "Refilling paragraphs on changes."
   :group 'fill)
@@ -169,40 +171,36 @@ complex processing.")
   "Post-command function to do refilling (conditionally)."
   (when refill-doit ; there was a change
     ;; There's probably scope for more special cases here...
-    (if (eq this-command 'self-insert-command)
-        ;; Treat self-insertion commands specially, since they don't
-        ;; always reset `refill-doit' -- for self-insertion commands that
-        ;; *don't* cause a refill, we want to leave it turned on so that
-        ;; any subsequent non-modification command will cause a refill.
-        (when (aref auto-fill-chars (char-before))
-          ;; Respond to the same characters as auto-fill (other than
-          ;; newline, covered below).
-          (refill-fill-paragraph-at refill-doit)
-          (setq refill-doit nil))
-      (cond
-       ((or (eq this-command 'quoted-insert)
-            (eq this-command 'fill-paragraph)
-            (eq this-command 'fill-region))
-        nil)
-       ((or (eq this-command 'newline)
-            (eq this-command 'newline-and-indent)
-            (eq this-command 'open-line))
-        ;; Don't zap what was just inserted.
-        (save-excursion
-          (beginning-of-line)           ; for newline-and-indent
-          (skip-chars-backward "\n")
-          (save-restriction
-            (narrow-to-region (point-min) (point))
-            (refill-fill-paragraph-at refill-doit)))
-        (widen)
-        (save-excursion
-          (skip-chars-forward "\n")
-          (save-restriction
-            (narrow-to-region (line-beginning-position) (point-max))
-            (refill-fill-paragraph-at refill-doit))))
-       (t
-        (refill-fill-paragraph-at refill-doit)))
-      (setq refill-doit nil))))
+    (case this-command
+      (self-insert-command
+       ;; Treat self-insertion commands specially, since they don't
+       ;; always reset `refill-doit' -- for self-insertion commands that
+       ;; *don't* cause a refill, we want to leave it turned on so that
+       ;; any subsequent non-modification command will cause a refill.
+       (when (aref auto-fill-chars (char-before))
+         ;; Respond to the same characters as auto-fill (other than
+         ;; newline, covered below).
+         (refill-fill-paragraph-at refill-doit)
+         (setq refill-doit nil)))
+      ((quoted-insert fill-paragraph fill-region) nil)
+      ((newline newline-and-indent open-line indent-new-comment-line
+        reindent-then-newline-and-indent)
+       ;; Don't zap what was just inserted.
+       (save-excursion
+         (beginning-of-line)            ; for newline-and-indent
+         (skip-chars-backward "\n")
+         (save-restriction
+           (narrow-to-region (point-min) (point))
+           (refill-fill-paragraph-at refill-doit)))
+       (widen)
+       (save-excursion
+         (skip-chars-forward "\n")
+         (save-restriction
+           (narrow-to-region (line-beginning-position) (point-max))
+           (refill-fill-paragraph-at refill-doit))))
+      (t
+       (refill-fill-paragraph-at refill-doit)))
+    (setq refill-doit nil)))
 
 (defun refill-pre-command-function ()
   "Pre-command function to do refilling (conditionally)."
@@ -213,7 +211,7 @@ complex processing.")
     (refill-fill-paragraph-at refill-doit)
     (setq refill-doit nil)))
 
-(defvar refill-late-fill-paragraph-function nil)
+(defvar refill-saved-state nil)
 
 ;;;###autoload
 (define-minor-mode refill-mode
@@ -228,16 +226,18 @@ refilling if they would cause auto-filling."
   (when refill-ignorable-overlay
     (delete-overlay refill-ignorable-overlay)
     (kill-local-variable 'refill-ignorable-overlay))
-  (when (local-variable-p 'refill-late-fill-paragraph-function)
-    (setq fill-paragraph-function refill-late-fill-paragraph-function)
-    (kill-local-variable 'refill-late-fill-paragraph-function))
+  (when (local-variable-p 'refill-saved-state)
+    (dolist (x refill-saved-state)
+      (set (make-local-variable (car x)) (cdr x)))
+    (kill-local-variable 'refill-saved-state))
   (if refill-mode
       (progn
         (add-hook 'after-change-functions 'refill-after-change-function nil t)
         (add-hook 'post-command-hook 'refill-post-command-function nil t)
         (add-hook 'pre-command-hook 'refill-pre-command-function nil t)
-        (set (make-local-variable 'refill-late-fill-paragraph-function)
-             fill-paragraph-function)
+        (set (make-local-variable 'refill-saved-state)
+             (mapcar (lambda (s) (cons s (symbol-value s)))
+                     '(fill-paragraph-function auto-fill-function)))
         ;; This provides the test for recursive paragraph filling.
         (set (make-local-variable 'fill-paragraph-function)
              'refill-fill-paragraph)
@@ -257,5 +257,5 @@ refilling if they would cause auto-filling."
 
 (provide 'refill)
 
-;;; arch-tag: 2c4ce9e8-1daa-4a3b-b6f8-fd6ac5bf6138
+;; arch-tag: 2c4ce9e8-1daa-4a3b-b6f8-fd6ac5bf6138
 ;;; refill.el ends here