merge trunk

8 files changed, 61 insertions, 25 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2a92c1178cf..d58eb0bfbbf 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2012-10-13  Chong Yidong  <cyd@gnu.org>
+
+        * textmodes/ispell.el (ispell-pdict-save): If flyspell-mode is
+        enabled, re-enable it (Bug#11963).
+
+2012-10-13  Martin Rudalics  <rudalics@gmx.at>
+
+        * emacs-lisp/debug.el (debug): When debugger-will-be-back is
+        non-nil, restore window configuration (Bug#12623).
+
 2012-10-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * help-fns.el (describe-variable, describe-function-1):
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index 6b308119abb..c30ccf3315e 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -213,7 +213,8 @@ first will be printed into the backtrace buffer."
              (or enable-recursive-minibuffers (> (minibuffer-depth) 0)))
             (standard-input t) (standard-output t)
             inhibit-redisplay
-            (cursor-in-echo-area nil))
+            (cursor-in-echo-area nil)
+            (window-configuration (current-window-configuration)))
         (unwind-protect
             (save-excursion
               (when (eq (car debugger-args) 'debug)
@@ -266,16 +267,19 @@ first will be printed into the backtrace buffer."
                 ;; Make sure we unbind buffer-read-only in the right buffer.
                 (save-excursion
                   (recursive-edit))))
-          (when (and (not debugger-will-be-back)
-                     (window-live-p debugger-window)
-                     (eq (window-buffer debugger-window) debugger-buffer))
-            ;; Record height of debugger window.
-            (setq debugger-previous-window-height
-                  (window-total-size debugger-window))
-            ;; Unshow debugger-buffer.
-            (quit-restore-window debugger-window debugger-bury-or-kill)
-            ;; Restore current buffer (Bug#12502).
-            (set-buffer debugger-old-buffer))
+          (if debugger-will-be-back
+              ;; Restore previous window configuration (Bug#12623).
+              (set-window-configuration window-configuration)
+            (when (and (window-live-p debugger-window)
+                       (eq (window-buffer debugger-window) debugger-buffer))
+              (progn
+                ;; Record height of debugger window.
+                (setq debugger-previous-window-height
+                      (window-total-size debugger-window))
+                ;; Unshow debugger-buffer.
+                (quit-restore-window debugger-window debugger-bury-or-kill)
+                ;; Restore current buffer (Bug#12502).
+                (set-buffer debugger-old-buffer))))
           ;; Restore previous state of debugger-buffer in case we were
           ;; in a recursive invocation of the debugger, otherwise just
           ;; erase the buffer and put it into fundamental mode.
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 51a4800de52..d591dc5fa85 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1893,11 +1893,14 @@ If so, ask if it needs to be saved."
   (interactive (list ispell-silently-savep t))
   (if (and ispell-pdict-modified-p (listp ispell-pdict-modified-p))
       (setq ispell-pdict-modified-p (car ispell-pdict-modified-p)))
-  (if (or ispell-pdict-modified-p force-save)
-      (if (or no-query (y-or-n-p "Personal dictionary modified.  Save? "))
-          (progn
-            (ispell-send-string "#\n")  ; save dictionary
-            (message "Personal dictionary saved."))))
+  (when (and (or ispell-pdict-modified-p force-save)
+             (or no-query
+                 (y-or-n-p "Personal dictionary modified.  Save? ")))
+    (ispell-send-string "#\n")  ; save dictionary
+    (message "Personal dictionary saved.")
+    (when flyspell-mode
+      (flyspell-mode 0)
+      (flyspell-mode 1)))
   ;; unassert variable, even if not saved to avoid questioning.
   (setq ispell-pdict-modified-p nil))
 
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index c7fc4fcbfe1..59222bcc957 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,14 @@
+2012-10-13  Liam Stitt  <stittl@cuug.ab.ca>  (tiny change)
+
+        * url-vars.el (url-uncompressor-alist):
+        * url-file.el (url-file-find-possibly-compressed-file, url-file):
+        Recognize .xz compression (Bug#11839).
+
+2012-10-13  Chong Yidong  <cyd@gnu.org>
+
+        * url-http.el (url-http):
+        * url.el (url-retrieve-internal): Doc fix (Bug#6407).
+
 2012-10-08  Glenn Morris  <rgm@gnu.org>
 
         * url-methods.el (url-scheme-get-property): url-https.el was
diff --git a/lisp/url/url-file.el b/lisp/url/url-file.el
index 4bbbdcf200c..3515d7493cc 100644
--- a/lisp/url/url-file.el
+++ b/lisp/url/url-file.el
@@ -40,7 +40,7 @@ can do automatic decompression for them, and won't find 'foo' if
 'foo.gz' exists, even though the FTP server would happily serve it up
 to them."
   (let ((scratch nil)
-        (compressed-extensions '("" ".gz" ".z" ".Z" ".bz2"))
+        (compressed-extensions '("" ".gz" ".z" ".Z" ".bz2" ".xz"))
         (found nil))
     (while (and compressed-extensions (not found))
       (if (file-exists-p (setq scratch (concat fname (pop compressed-extensions))))
@@ -177,6 +177,7 @@ to them."
                              (".uue" "x-uuencoded")
                              (".hqx" "x-hqx")
                              (".bz2" "x-bzip2")
+                             (".xz" "x-xz")
                              (_ nil)))
 
     (if (file-directory-p filename)
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 85b6efcde0d..73d53e08c59 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1150,8 +1150,12 @@ the end of the document."
 (defun url-http (url callback cbargs &optional retry-buffer)
   "Retrieve URL via HTTP asynchronously.
 URL must be a parsed URL.  See `url-generic-parse-url' for details.
-When retrieval is completed, the function CALLBACK is executed with
-CBARGS as the arguments.
+
+When retrieval is completed, execute the function CALLBACK, using
+the arguments listed in CBARGS.  The first element in CBARGS
+should be a plist describing what has happened so far during the
+request, as described in the docstring of `url-retrieve' (if in
+doubt, specify nil).
 
 Optional arg RETRY-BUFFER, if non-nil, specifies the buffer of a
 previous `url-http' call, which is being re-attempted."
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 29f1e2cde0c..fdfd0e9868d 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -152,7 +152,8 @@ variable."
                                     (".uue" . "x-uuencoded")
                                     (".hqx" . "x-hqx")
                                     (".Z"  . "x-compress")
-                                    (".bz2"  . "x-bzip2"))
+                                    (".bz2" . "x-bzip2")
+                                    (".xz" . "x-xz"))
   "An alist of file extensions and appropriate content-transfer-encodings."
   :type '(repeat (cons :format "%v"
                        (string :tag "Extension")
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 87ae7a51aac..b219151a30c 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -131,9 +131,9 @@ characters are percent-encoded; see `url-encode-url'.
 CALLBACK is called when the object has been completely retrieved, with
 the current buffer containing the object, and any MIME headers associated
 with it.  It is called as (apply CALLBACK STATUS CBARGS).
-STATUS is a list with an even number of elements representing
-what happened during the request, with most recent events first,
-or an empty list if no events have occurred.  Each pair is one of:
+STATUS is a plist representing what happened during the request,
+with most recent events first, or an empty list if no events have
+occurred.  Each pair is one of:
 
 \(:redirect REDIRECTED-TO) - the request was redirected to this URL
 \(:error (ERROR-SYMBOL . DATA)) - an error occurred.  The error can be
@@ -169,8 +169,10 @@ URL-encoded before it's used."
 (defun url-retrieve-internal (url callback cbargs &optional silent
                                   inhibit-cookies)
   "Internal function; external interface is `url-retrieve'.
-CBARGS is what the callback will actually receive - the first item is
-the list of events, as described in the docstring of `url-retrieve'.
+CBARGS is the list of arguments that the callback function will
+receive; its first element should be a plist specifying what has
+happened so far during the request, as described in the docstring
+of `url-retrieve' (if in doubt, specify nil).
 
 If SILENT, don't message progress reports and the like.
 If INHIBIT-COOKIES, cookies will neither be stored nor sent to