upstream

42 files changed, 752 insertions, 365 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 68b48f5047e..bd0e6f865cd 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,11 +1,203 @@
+2012-03-13  Kaushik Srenevasan  <ksrenevasan@gmail.com>  (tiny change)
+
+        * progmodes/gdb-mi.el (gdb-invalidate-disassembly):
+        For dynamically generated code, follow $PC.
+        (gdb-disassembly-handler-custom): Handle no function name case.
+
+2012-03-13  Tim Landscheidt  <tim@tim-landscheidt.de>  (tiny change)
+
+        * calendar/icalendar.el (icalendar-export-file, icalendar-import-file):
+        * emulation/ws-mode.el (ws-query-replace):
+        * sort.el (sort-regexp-fields):
+        Fix missing trailing whitespace in interactive prompts.  (Bug#11002)
+
+2012-03-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * dabbrev.el: Fix cycle completion order (bug#10963).
+        (dabbrev--last-obarray, dabbrev--last-completion-buffer): Remove.
+        (dabbrev-completion): Don't use an obarray; provide
+        a cycle-sort-function.
+
+2012-03-12  Leo Liu  <sdl.web@gmail.com>
+
+        * simple.el (kill-new): Use equal-including-properties for
+        comparison.
+        (kill-do-not-save-duplicates): Doc fix.
+
+2012-03-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * dabbrev.el: Fix cycle completion (bug#10963).
+        Use lexical binding and wrap to 80 columns.
+        (dabbrev-completion): Delay computing the list of completions.
+
+2012-03-12  Kenichi Handa  <handa@m17n.org>
+
+        * international/quail.el (quail-insert-kbd-layout): Surround each
+        row by LRO and PDF instead of inserting many LRMs.  Pad the left
+        and right of each non-spacing marks.  Insert invisible space
+        between lower and upper characters to prevent composition.
+
+2012-03-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (minibuffer-complete): Don't get confused when the
+        function is run twice via different commands (bug#10958).
+        (complete-with-action): Fix docstring.
+
+2012-03-12  Chong Yidong  <cyd@gnu.org>
+
+        * nxml/nxml-mode.el (nxml-mode-map): Do not bind C-RET (Bug#6776).
+        (nxml-completion-at-point-function): New function.
+        (nxml-mode): Use it.
+        (nxml-bind-meta-tab-to-complete-flag): Default to t.
+
+        * emacs-lisp/package.el (package-unpack, package-unpack-single):
+        Load generated autoloads file before byte compiling (Bug#10970).
+        (package--make-autoloads-and-compile): New helper fun.
+
+2012-03-12  Christopher Schmidt  <christopher@ch.ristopher.com>
+
+        * ibuffer.el (ibuffer-redisplay): Remove another gratuitous error.
+
+2012-03-11  Michael Albinus  <michael.albinus@gmx.de>
+
+        * autorevert.el (auto-revert-handler): Ensure, that
+        file-readable-p is applied only for local files or in
+        auto-revert-tail-mode.
+
+2012-03-11  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * server.el (server-eval-at): Handle non-tcp connections.
+        Decode result string.
+
+        * server.el (server-msg-size): New constant.
+        (server-reply-print): New function.
+        (server-eval-and-print): Use it.
+        (server-eval-at): Use server-quote-arg and server-unquote-arg.
+        Handle -print-nonl.
+
+2012-03-11  Christopher Schmidt  <christopher@ch.ristopher.com>
+
+        * ibuffer.el (ibuffer-redisplay): Remove gratuitous error
+        (Bug#10987).
+
+2012-03-11  Chong Yidong  <cyd@gnu.org>
+
+        * simple.el (goto-line): Doc fix (Bug#9938).
+
+        * subr.el (save-window-excursion): Doc fix (Bug#9979).
+
+        * dabbrev.el (dabbrev--find-expansion): Update progress reporter
+        when finished (Bug#10963).
+
+2012-03-11  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (split-window-below): Fix bug in case where
+        split-window-keep-point is nil (Bug#10971).
+
+2012-03-11  Juri Linkov  <juri@jurta.org>
+
+        * replace.el (replace-highlight): Set isearch-word to nil
+        unconditionally.  (Bug#10887)
+
+2012-03-10  Eli Zaretskii  <eliz@gnu.org>
+
+        * net/mairix.el (mairix-replace-invalid-chars): Rename from
+        mairix-replace-illegal-chars; all callers changed.  Don't remove
+        ^, ~, and = characters: they are meaningful in mairix search
+        specs.
+        (mairix-widget-create-query): Add usage information about mairix
+        search forms: negating words, searching for substrings, etc.
+
+2012-03-10  Jae-hyeon Park  <jae-hyeon.park@desy.de>  (tiny change)
+
+        * international/fontset.el (font-encoding-alist): Add an entry for
+        ksx1001 (Bug#5667).
+
+2012-03-10  Richard Stallman  <rms@gnu.org>
+
+        * mail/sendmail.el (mail-encode-header):
+        Set rfc2047-encode-encoded-words.
+
+        * mail/mail-utils.el (mail-quote-printable): Quote multibyte chars.
+
+        * mail/rmail.el (rmail-buffers-swapped-p): Don't assume dead
+        view buffer means not swapped.
+        (rmail-view-buffer-kill-buffer-hook): Give buf name in error msg.
+        (rmail-write-region-annotate): Error if real text has disappeared.
+
+        * epa-mail.el (epa-mail-encrypt): Bind inhibit-read-only.
+
+2012-03-10  Chong Yidong  <cyd@gnu.org>
+
+        * emulation/cua-rect.el (cua--init-rectangles):
+        * emulation/cua-base.el (cua--init-keymaps):
+        Add delete-forward-char to remappings (Bug#9666).
+
+2012-03-10  Martin Rudalics  <rudalics@gmx.at>
+
+        * speedbar.el (speedbar-unhighlight-one-tag-line):
+        Avoid unhighlighting due to frame switching (Bug#10275).
+
+2012-03-10  Chong Yidong  <cyd@gnu.org>
+
+        * minibuffer.el (completion-in-region, completion-help-at-point):
+        Give the completion field overlay a high priority (Bug#6830).
+
+        * dired.el (dired-goto-file): Recognize absolute file name
+        listings (Bug#7126).
+        (dired-goto-file-1): New helper function.
+        (dired-toggle-read-only): Inhibit warnings.
+
+2012-03-09  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/dbus.el: (dbus-property-handler): Return empty array if
+        there are no properties.
+
+2012-03-09  Leo Liu  <sdl.web@gmail.com>
+
+        * savehist.el (savehist-printable): Stricter check for string
+        value (Bug#10937).
+
+2012-03-09  Eli Zaretskii  <eliz@gnu.org>
+
+        * mail/smtpmail.el (smtpmail-send-it):
+        Bind coding-system-for-write to *-unix, so that FCC files are kept in
+        valid mbox format.
+
+2012-03-09  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (dir-locals-find-file):
+        Don't check result is regular, readable.
+        (dir-locals-read-from-file): Demote errors.
+
+2012-03-08  Eli Zaretskii  <eliz@gnu.org>
+
+        * international/quail.el (quail-insert-kbd-layout):
+        Insert invisible LRM characters before each character in a keyboard
+        layout cell, to prevent their reordering by bidi display engine.
+        For details, see the discussion in
+        http://lists.gnu.org/archive/html/emacs-devel/2012-03/msg00085.html.
+
+2012-03-08  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-cmds.el (c-mark-function): Make it leave a mark at
+        the starting position; make it extend the marked region when
+        invoked repeatedly - all under appropriate circumstances.
+        Fixes bugs #5525, #10906.
+
+2012-03-08  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (locate-dominating-file, dir-locals-find-file):
+        Undo 2012-03-06 change.
+
 2012-03-07  Eli Zaretskii  <eliz@gnu.org>
 
-        * international/quail.el (quail-help): Force
-        bidi-paragraph-direction be left-to-right.  See discussion in
+        * international/quail.el (quail-help):
+        Force bidi-paragraph-direction be left-to-right.  See discussion in
         http://lists.gnu.org/archive/html/emacs-devel/2012-03/msg00062.html
         for the reason.
 
-2012-03-07  Michael Albinus  <Michael.Albinus@alcatel-lucent.com>
+2012-03-07  Michael Albinus  <michael.albinus@gmx.de>
 
         Avoid superfluous registering of signals.  (Bug#10807)
 
@@ -133,16 +325,16 @@
         New variables for...
         (c-state-semi-safe-place): New function.  Here, in a macro is "safe".
         (c-invalidate-state-cache-1): New stuff for c-state-semi-safe-place.
-        (c-in-literal, c-literal-limits, c-determine-limit-get-base): Use
-        c-state-semi-safe-place.
+        (c-in-literal, c-literal-limits, c-determine-limit-get-base):
+        Use c-state-semi-safe-place.
 
-        * progmodes/cc-langs.el (c-get-state-before-change-functions): Add
-        c-invalidate-macro-cache to the C, C++, Obj entries.
+        * progmodes/cc-langs.el (c-get-state-before-change-functions):
+        Add c-invalidate-macro-cache to the C, C++, Obj entries.
 
 2012-03-02  Michael Albinus  <michael.albinus@gmx.de>
 
-        * jka-compr.el (jka-compr-call-process): Apply
-        `file-accessible-directory-p' only when the default directory is
+        * jka-compr.el (jka-compr-call-process):
+        Apply `file-accessible-directory-p' only when the default directory is
         not remote.
 
 2012-03-01  Michael Albinus  <michael.albinus@gmx.de>
diff --git a/lisp/autorevert.el b/lisp/autorevert.el
index c0a77bd5935..e0bde7c6dc5 100644
--- a/lisp/autorevert.el
+++ b/lisp/autorevert.el
@@ -439,17 +439,18 @@ This is an internal function used by Auto-Revert Mode."
     (let* ((buffer (current-buffer)) size
            (revert
             (or (and buffer-file-name
-                     (file-readable-p buffer-file-name)
                      (if auto-revert-tail-mode
                          ;; Tramp caches the file attributes.  Setting
                          ;; `remote-file-name-inhibit-cache' forces Tramp
                          ;; to reread the values.
                          (let ((remote-file-name-inhibit-cache t))
-                           (/= auto-revert-tail-pos
-                               (setq size
-                                     (nth 7 (file-attributes
-                                             buffer-file-name)))))
+                           (and (file-readable-p buffer-file-name)
+                                (/= auto-revert-tail-pos
+                                    (setq size
+                                          (nth 7 (file-attributes
+                                                  buffer-file-name))))))
                        (and (not (file-remote-p buffer-file-name))
+                            (file-readable-p buffer-file-name)
                             (not (verify-visited-file-modtime buffer)))))
                 (and (or auto-revert-mode
                          global-auto-revert-non-file-buffers)
diff --git a/lisp/calendar/icalendar.el b/lisp/calendar/icalendar.el
index 83bda94fefe..f1549ec20b1 100644
--- a/lisp/calendar/icalendar.el
+++ b/lisp/calendar/icalendar.el
@@ -915,7 +915,7 @@ would be \"pm\"."
   "Export diary file to iCalendar format.
 All diary entries in the file DIARY-FILENAME are converted to iCalendar
 format.  The result is appended to the file ICAL-FILENAME."
-  (interactive "FExport diary data from file:
+  (interactive "FExport diary data from file: \n\
 Finto iCalendar file: ")
   (save-current-buffer
     (set-buffer (find-file diary-filename))
@@ -1794,7 +1794,7 @@ Argument ICAL-FILENAME output iCalendar file.
 Argument DIARY-FILENAME input `diary-file'.
 Optional argument NON-MARKING determines whether events are created as
 non-marking or not."
-  (interactive "fImport iCalendar data from file:
+  (interactive "fImport iCalendar data from file: \n\
 Finto diary file:
 p")
   ;; clean up the diary file
diff --git a/lisp/cedet/ChangeLog b/lisp/cedet/ChangeLog
index 4dc5fe4df21..f185c457ee2 100644
--- a/lisp/cedet/ChangeLog
+++ b/lisp/cedet/ChangeLog
@@ -1,3 +1,15 @@
+2012-03-12  David Engster  <deng@randomsample.de>
+
+        * semantic/db-find.el
+        (semanticdb-find-translate-path-brutish-default): If we don't yet
+        have a proper table for PATH, use `semanticdb-current-database'
+        instead (bug #10343).
+
+2012-03-11  David Engster  <deng@randomsample.de>
+
+        * semantic/wisent/javascript.el (js-mode): Define `js-mode' as
+        child-mode of `javascript-mode' (bug #8445).
+
 2012-02-28  Glenn Morris  <rgm@gnu.org>
 
         * semantic/db.el (semanticdb-search-results-table):
diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el
index ca6a8fbf5ca..15ef3b09238 100644
--- a/lisp/cedet/semantic/db-find.el
+++ b/lisp/cedet/semantic/db-find.el
@@ -325,8 +325,10 @@ Default action as described in `semanticdb-find-translate-path'."
          (cond ((null path) semanticdb-current-database)
                ((semanticdb-table-p path) (oref path parent-db))
                (t (let ((tt (semantic-something-to-tag-table path)))
-                    ;; @todo - What does this DO ??!?!
-                    (with-current-buffer (semantic-tag-buffer (car tt))
+                    (if tt
+                        ;; @todo - What does this DO ??!?!
+                        (with-current-buffer (semantic-tag-buffer (car tt))
+                          semanticdb-current-database)
                       semanticdb-current-database))))))
     (apply
      #'nconc
diff --git a/lisp/cedet/semantic/wisent/javascript.el b/lisp/cedet/semantic/wisent/javascript.el
index 33644414b30..8ed83e87bce 100644
--- a/lisp/cedet/semantic/wisent/javascript.el
+++ b/lisp/cedet/semantic/wisent/javascript.el
@@ -75,6 +75,10 @@ This function overrides `get-local-variables'."
 ;;
 ;; This sets up the javascript parser
 
+;; Since javascript-mode is an alias for js-mode, let it inherit all
+;; the overrides.
+(define-child-mode js-mode javascript-mode)
+
 ;; In semantic-imenu.el, not part of Emacs.
 (defvar semantic-imenu-summary-function)
 
diff --git a/lisp/dabbrev.el b/lisp/dabbrev.el
index 7b94b53e6c7..c5b370bfa61 100644
--- a/lisp/dabbrev.el
+++ b/lisp/dabbrev.el
@@ -1,4 +1,4 @@
-;;; dabbrev.el --- dynamic abbreviation package
+;;; dabbrev.el --- dynamic abbreviation package  -*- lexical-binding: t -*-
 
 ;; Copyright (C) 1985-1986, 1992, 1994, 1996-1997, 2000-2012
 ;;   Free Software Foundation, Inc.
@@ -291,9 +291,6 @@ this list."
 ;; Internal variables
 ;;----------------------------------------------------------------
 
-;; Last obarray of completions in `dabbrev-completion'
-(defvar dabbrev--last-obarray nil)
-
 ;; Table of expansions seen so far
 (defvar dabbrev--last-table nil)
 
@@ -321,9 +318,6 @@ this list."
 ;; The buffer we found the expansion last time.
 (defvar dabbrev--last-buffer-found nil)
 
-;; The buffer we last did a completion in.
-(defvar dabbrev--last-completion-buffer nil)
-
 ;; If non-nil, a function to use when copying successive words.
 ;; It should be `upcase' or `downcase'.
 (defvar dabbrev--last-case-pattern nil)
@@ -387,49 +381,46 @@ then it searches *all* buffers."
          (abbrev (dabbrev--abbrev-at-point))
          (beg (progn (search-backward abbrev) (point)))
          (end (progn (search-forward abbrev) (point)))
-         (ignore-case-p (and (if (eq dabbrev-case-fold-search 'case-fold-search)
-                                 case-fold-search
-                               dabbrev-case-fold-search)
-                             (or (not dabbrev-upcase-means-case-search)
-                                 (string= abbrev (downcase abbrev)))))
-         (my-obarray dabbrev--last-obarray))
-    (save-excursion
-      ;;--------------------------------
-      ;; New abbreviation to expand.
-      ;;--------------------------------
-      (setq dabbrev--last-abbreviation abbrev)
-      ;; Find all expansion
-      (let ((completion-list
-             (dabbrev--find-all-expansions abbrev ignore-case-p))
-            (completion-ignore-case ignore-case-p))
-        ;; Make an obarray with all expansions
-        (setq my-obarray (make-vector (length completion-list) 0))
-        (or (> (length my-obarray) 0)
-            (error "No dynamic expansion for \"%s\" found%s"
-                   abbrev
-                   (if dabbrev--check-other-buffers "" " in this-buffer")))
-        (cond
-         ((or (not ignore-case-p)
-              (not dabbrev-case-replace))
-          (mapc (function (lambda (string)
-                            (intern string my-obarray)))
-                completion-list))
-         ((string= abbrev (upcase abbrev))
-          (mapc (function (lambda (string)
-                            (intern (upcase string) my-obarray)))
-                completion-list))
-         ((string= (substring abbrev 0 1)
-                   (upcase (substring abbrev 0 1)))
-          (mapc (function (lambda (string)
-                            (intern (capitalize string) my-obarray)))
-                completion-list))
-         (t
-          (mapc (function (lambda (string)
-                            (intern (downcase string) my-obarray)))
-                completion-list)))
-        (setq dabbrev--last-obarray my-obarray)
-        (setq dabbrev--last-completion-buffer (current-buffer))))
-    (completion-in-region beg end my-obarray)))
+         (ignore-case-p
+          (and (if (eq dabbrev-case-fold-search 'case-fold-search)
+                   case-fold-search
+                 dabbrev-case-fold-search)
+               (or (not dabbrev-upcase-means-case-search)
+                   (string= abbrev (downcase abbrev)))))
+         (list 'uninitialized)
+         (table
+          (lambda (s p a)
+            (if (eq a 'metadata)
+                `(metadata (cycle-sort-function . ,#'identity)
+                           (category . dabbrev))
+              (when (eq list 'uninitialized)
+                (save-excursion
+                  ;;--------------------------------
+                  ;; New abbreviation to expand.
+                  ;;--------------------------------
+                  (setq dabbrev--last-abbreviation abbrev)
+                  ;; Find all expansion
+                  (let ((completion-list
+                         (dabbrev--find-all-expansions abbrev ignore-case-p))
+                        (completion-ignore-case ignore-case-p))
+                    (or (consp completion-list)
+                        (error "No dynamic expansion for \"%s\" found%s"
+                               abbrev
+                               (if dabbrev--check-other-buffers
+                                   "" " in this-buffer")))
+                    (setq list
+                          (cond
+                           ((not (and ignore-case-p dabbrev-case-replace))
+                            completion-list)
+                           ((string= abbrev (upcase abbrev))
+                            (mapcar #'upcase completion-list))
+                           ((string= (substring abbrev 0 1)
+                                     (upcase (substring abbrev 0 1)))
+                            (mapcar #'capitalize completion-list))
+                           (t
+                            (mapcar #'downcase completion-list)))))))
+              (complete-with-action a list s p)))))
+    (completion-in-region beg end table)))
 
 ;;;###autoload
 (defun dabbrev-expand (arg)
@@ -521,12 +512,13 @@ See also `dabbrev-abbrev-char-regexp' and \\[dabbrev-completion]."
       ;;--------------------------------
       (or expansion
           (setq expansion
-                (dabbrev--find-expansion abbrev direction
-                                         (and (if (eq dabbrev-case-fold-search 'case-fold-search)
-                                                  case-fold-search
-                                                dabbrev-case-fold-search)
-                                              (or (not dabbrev-upcase-means-case-search)
-                                                  (string= abbrev (downcase abbrev))))))))
+                (dabbrev--find-expansion
+                 abbrev direction
+                 (and (if (eq dabbrev-case-fold-search 'case-fold-search)
+                          case-fold-search
+                        dabbrev-case-fold-search)
+                      (or (not dabbrev-upcase-means-case-search)
+                          (string= abbrev (downcase abbrev))))))))
     (cond
      ((not expansion)
       (dabbrev--reset-global-variables)
@@ -621,8 +613,6 @@ all skip characters."
 
 (defun dabbrev--reset-global-variables ()
   "Initialize all global variables."
-  ;; dabbrev--last-obarray and dabbrev--last-completion-buffer
-  ;; must not be reset here.
   (setq dabbrev--last-table nil
         dabbrev--last-abbreviation nil
         dabbrev--last-abbrev-location nil
@@ -667,13 +657,13 @@ of the expansion in `dabbrev--last-expansion-location'."
         (let ((case-fold-search ignore-case)
               (count n))
           (while (and (> count 0)
-                      (setq expansion (dabbrev--search abbrev
-                                                       reverse
-                                                       (and ignore-case
-                                                            (if (eq dabbrev-case-distinction 'case-replace)
-                                                                case-replace
-                                                              dabbrev-case-distinction))
-                                                       )))
+                      (setq expansion (dabbrev--search
+                                       abbrev reverse
+                                       (and ignore-case
+                                            (if (eq dabbrev-case-distinction
+                                                    'case-replace)
+                                                case-replace
+                                              dabbrev-case-distinction)))))
             (setq count (1- count))))
         (and expansion
              (setq dabbrev--last-expansion-location (point)))
@@ -763,6 +753,7 @@ of the start of the occurrence."
                                      (- (length dabbrev--friend-buffer-list)))
            (setq dabbrev--last-expansion-location (point-min))
            (setq expansion (dabbrev--try-find abbrev nil 1 ignore-case)))
+         (progress-reporter-done dabbrev--progress-reporter)
          expansion)))))
 
 ;; Compute the list of buffers to scan.
@@ -828,14 +819,15 @@ EXPANSION is the expansion substring to be used this time.
 RECORD-CASE-PATTERN, if non-nil, means set `dabbrev--last-case-pattern'
 to record whether we upcased the expansion, downcased it, or did neither."
   ;;(undo-boundary)
-  (let ((use-case-replace (and (if (eq dabbrev-case-fold-search 'case-fold-search)
-                                   case-fold-search
-                                 dabbrev-case-fold-search)
-                               (or (not dabbrev-upcase-means-case-search)
-                                   (string= abbrev (downcase abbrev)))
-                               (if (eq dabbrev-case-replace 'case-replace)
-                                   case-replace
-                                 dabbrev-case-replace))))
+  (let ((use-case-replace
+         (and (if (eq dabbrev-case-fold-search 'case-fold-search)
+                  case-fold-search
+                dabbrev-case-fold-search)
+              (or (not dabbrev-upcase-means-case-search)
+                  (string= abbrev (downcase abbrev)))
+              (if (eq dabbrev-case-replace 'case-replace)
+                  case-replace
+                dabbrev-case-replace))))
 
     ;; If we upcased or downcased the original expansion,
     ;; do likewise for the subsequent words when we copy them.
@@ -861,12 +853,13 @@ to record whether we upcased the expansion, downcased it, or did neither."
     (let ((expansion-rest (substring expansion 1))
           (first-letter-position (string-match "[[:alpha:]]" abbrev)))
       (if (or (null first-letter-position)
-              (and (not (and (or (string= expansion-rest (downcase expansion-rest))
-                                 (string= expansion-rest (upcase expansion-rest)))
-                             (or (string= abbrev (downcase abbrev))
-                                 (and (string= abbrev (upcase abbrev))
-                                      (> (- (length abbrev) first-letter-position)
-                                         1)))))
+              (and (not
+                    (and (or (string= expansion-rest (downcase expansion-rest))
+                             (string= expansion-rest (upcase expansion-rest)))
+                         (or (string= abbrev (downcase abbrev))
+                             (and (string= abbrev (upcase abbrev))
+                                  (> (- (length abbrev) first-letter-position)
+                                     1)))))
                    (string= abbrev
                             (substring expansion 0 (length abbrev)))))
           (setq use-case-replace nil)))
@@ -950,9 +943,9 @@ Leaves point at the location of the start of the expansion."
       ;; Limited search.
       (save-restriction
         (and dabbrev-limit
-             (narrow-to-region dabbrev--last-expansion-location
-                               (+ (point)
-                                  (if reverse (- dabbrev-limit) dabbrev-limit))))
+             (narrow-to-region
+              dabbrev--last-expansion-location
+              (+ (point) (if reverse (- dabbrev-limit) dabbrev-limit))))
         ;;--------------------------------
         ;; Look for a distinct expansion, using dabbrev--last-table.
         ;;--------------------------------
diff --git a/lisp/dired.el b/lisp/dired.el
index 57bf3c88322..d26e7004cc3 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -1964,7 +1964,8 @@ Otherwise, for buffers inheriting from dired-mode, call `toggle-read-only'."
   (interactive)
   (if (eq major-mode 'dired-mode)
       (wdired-change-to-wdired-mode)
-    (toggle-read-only)))
+    (with-no-warnings
+      (toggle-read-only))))
 
 (defun dired-next-line (arg)
   "Move down lines then position at filename.
@@ -2622,58 +2623,61 @@ instead of `dired-actual-switches'."
               (read-file-name "Goto file: "
                               (dired-current-directory))))
      (push-mark)))
-  (setq file (directory-file-name file)) ; does no harm if no directory
-  (let (found case-fold-search dir)
-    (setq dir (or (file-name-directory file)
-                  (error "File name `%s' is not absolute" file)))
-    (save-excursion
-      ;; The hair here is to get the result of dired-goto-subdir
-      ;; without really calling it if we don't have any subdirs.
-      (if (if (string= dir (expand-file-name default-directory))
-              (goto-char (point-min))
-            (and (cdr dired-subdir-alist)
-                 (dired-goto-subdir dir)))
-          (let ((base (file-name-nondirectory file))
-                search-string
-                (boundary (dired-subdir-max)))
-            (setq search-string
-                  (replace-regexp-in-string "\^m" "\\^m" base nil t))
-            (setq search-string
-                  (replace-regexp-in-string "\\\\" "\\\\" search-string nil t))
-            (and (dired-switches-escape-p dired-actual-switches)
-                 (string-match "[ \t\n]" search-string)
-                 ;; FIXME to fix this for all possible file names
-                 ;; (embedded control characters etc), we need to
-                 ;; escape everything that `ls -b' does.
-                 (setq search-string
-                       (replace-regexp-in-string " " "\\ "
-                                                 search-string nil t)
-                       search-string
-                       (replace-regexp-in-string "\t" "\\t"
-                                                 search-string nil t)
-                       search-string
-                       (replace-regexp-in-string "\n" "\\n"
-                                                 search-string nil t)))
-            (while (and (not found)
-                        ;; filenames are preceded by SPC, this makes
-                        ;; the search faster (e.g. for the filename "-"!).
-                        (search-forward (concat " " search-string)
-                                        boundary 'move))
-              ;; Match could have BASE just as initial substring or
-              ;; or in permission bits or date or
-              ;; not be a proper filename at all:
-              (if (equal base (dired-get-filename 'no-dir t))
-                    ;; Must move to filename since an (actually
-                    ;; correct) match could have been elsewhere on the
-                    ;; ;; line (e.g. "-" would match somewhere in the
-                    ;; permission bits).
-                  (setq found (dired-move-to-filename))
-                ;; If this isn't the right line, move forward to avoid
-                ;; trying this line again.
-                (forward-line 1))))))
-    (and found
-         ;; return value of point (i.e., FOUND):
-         (goto-char found))))
+  (unless (file-name-absolute-p file)
+    (error "File name `%s' is not absolute" file))
+  (setq file (directory-file-name file)) ; does no harm if not a directory
+  (let* ((case-fold-search nil)
+         (dir (file-name-directory file))
+         (found (or
+                 ;; First, look for a listing under the absolute name.
+                 (save-excursion
+                   (goto-char (point-min))
+                   (dired-goto-file-1 file file (point-max)))
+                 ;; Otherwise, look for it as a relative name.  The
+                 ;; hair is to get the result of `dired-goto-subdir'
+                 ;; without calling it if we don't have any subdirs.
+                 (save-excursion
+                   (when (if (string= dir (expand-file-name default-directory))
+                             (goto-char (point-min))
+                           (and (cdr dired-subdir-alist)
+                                (dired-goto-subdir dir)))
+                     (dired-goto-file-1 (file-name-nondirectory file)
+                                        file
+                                        (dired-subdir-max)))))))
+    ;; Return buffer position, if found.
+    (if found
+        (goto-char found))))
+
+(defun dired-goto-file-1 (file full-name limit)
+  "Advance to the Dired listing labeled by FILE; return its position.
+Return nil if the listing is not found.  If FILE contains
+characters that would not appear in a Dired buffer, search using
+the quoted forms of those characters.
+
+FULL-NAME specifies the actual file name the listing must have,
+as returned by `dired-get-filename'.  LIMIT is the search limit."
+  (let (str)
+    (setq str (replace-regexp-in-string "\^m" "\\^m"  file nil t))
+    (setq str (replace-regexp-in-string "\\\\" "\\\\" str nil t))
+    (and (dired-switches-escape-p dired-actual-switches)
+         (string-match "[ \t\n]" str)
+         ;; FIXME: to fix this for embedded control characters etc, we
+         ;; should escape everything that `ls -b' does.
+         (setq str (replace-regexp-in-string " " "\\ "  str nil t)
+               str (replace-regexp-in-string "\t" "\\t" str nil t)
+               str (replace-regexp-in-string "\n" "\\n" str nil t)))
+    (let ((found nil)
+          ;; filenames are preceded by SPC, this makes the search faster
+          ;; (e.g. for the filename "-").
+          (search-string (concat " " str)))
+      (while (and (not found)
+                  (search-forward search-string limit 'move))
+        ;; Check that we are in the right place.  Match could have
+        ;; BASE just as initial substring or in permission bits etc.
+        (if (equal full-name (dired-get-filename nil t))
+            (setq found (dired-move-to-filename))
+          (forward-line 1)))
+      found)))
 
 (defvar dired-find-subdir)
 
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index fd0eb029fc3..5b158eb994f 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -607,16 +607,25 @@ untar into a directory named DIR; otherwise, signal an error."
         (error "Package does not untar cleanly into directory %s/" dir))))
   (tar-untar-buffer))
 
-(defun package-unpack (name version)
-  (let* ((dirname (concat (symbol-name name) "-" version))
+(defun package-unpack (package version)
+  (let* ((name (symbol-name package))
+         (dirname (concat name "-" version))
          (pkg-dir (expand-file-name dirname package-user-dir)))
     (make-directory package-user-dir t)
     ;; FIXME: should we delete PKG-DIR if it exists?
     (let* ((default-directory (file-name-as-directory package-user-dir)))
       (package-untar-buffer dirname)
-      (package-generate-autoloads (symbol-name name) pkg-dir)
-      (let ((load-path (cons pkg-dir load-path)))
-        (byte-recompile-directory pkg-dir 0 t)))))
+      (package--make-autoloads-and-compile name pkg-dir))))
+
+(defun package--make-autoloads-and-compile (name pkg-dir)
+  "Generate autoloads and do byte-compilation for package named NAME.
+PKG-DIR is the name of the package directory."
+  (package-generate-autoloads name pkg-dir)
+  (let ((load-path (cons pkg-dir load-path)))
+    ;; We must load the autoloads file before byte compiling, in
+    ;; case there are magic cookies to set up non-trivial paths.
+    (load (expand-file-name (concat name "-autoloads") pkg-dir) nil t)
+    (byte-recompile-directory pkg-dir 0 t)))
 
 (defun package--write-file-no-coding (file-name)
   (let ((buffer-file-coding-system 'no-conversion))
@@ -656,9 +665,7 @@ untar into a directory named DIR; otherwise, signal an error."
          nil
          pkg-file
          nil nil nil 'excl))
-      (package-generate-autoloads file-name pkg-dir)
-      (let ((load-path (cons pkg-dir load-path)))
-        (byte-recompile-directory pkg-dir 0 t)))))
+      (package--make-autoloads-and-compile file-name pkg-dir))))
 
 (defmacro package--with-work-buffer (location file &rest body)
   "Run BODY in a buffer containing the contents of FILE at LOCATION.
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 9e7be0f670d..a918f298a4e 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1478,6 +1478,7 @@ If ARG is the atom `-', scroll upward by nearly full screen."
   (define-key cua--region-keymap [remap backward-delete-char]   'cua-delete-region)
   (define-key cua--region-keymap [remap backward-delete-char-untabify] 'cua-delete-region)
   (define-key cua--region-keymap [remap delete-char]            'cua-delete-region)
+  (define-key cua--region-keymap [remap delete-forward-char]    'cua-delete-region)
   ;; kill region
   (define-key cua--region-keymap [remap kill-region]            'cua-cut-region)
   (define-key cua--region-keymap [remap clipboard-kill-region]  'cua-cut-region)
diff --git a/lisp/emulation/cua-rect.el b/lisp/emulation/cua-rect.el
index 95b77a697f1..e3aade760dc 100644
--- a/lisp/emulation/cua-rect.el
+++ b/lisp/emulation/cua-rect.el
@@ -1420,6 +1420,7 @@ With prefix arg, indent to that column."
   (define-key cua--rectangle-keymap [remap kill-ring-save]      'cua-copy-rectangle)
   (define-key cua--rectangle-keymap [remap kill-region]         'cua-cut-rectangle)
   (define-key cua--rectangle-keymap [remap delete-char]         'cua-delete-rectangle)
+  (define-key cua--rectangle-keymap [remap delete-forward-char] 'cua-delete-rectangle)
   (define-key cua--rectangle-keymap [remap set-mark-command]    'cua-toggle-rectangle-mark)
 
   (define-key cua--rectangle-keymap [remap forward-char]        'cua-resize-rectangle-right)
diff --git a/lisp/emulation/ws-mode.el b/lisp/emulation/ws-mode.el
index aa8d647ec11..0c7be145751 100644
--- a/lisp/emulation/ws-mode.el
+++ b/lisp/emulation/ws-mode.el
@@ -716,7 +716,7 @@ This will only work for errors raised by WordStar mode functions."
 
 (defun ws-query-replace (from to)
   "In WordStar mode: Search string, remember string for repetition."
-  (interactive "sReplace:
+  (interactive "sReplace: \n\
 sWith: " )
   (setq ws-search-string from)
   (setq ws-search-direction t)
diff --git a/lisp/epa-mail.el b/lisp/epa-mail.el
index 22bfe03cab0..be5b849651c 100644
--- a/lisp/epa-mail.el
+++ b/lisp/epa-mail.el
@@ -192,7 +192,9 @@ If no one is selected, symmetric encryption will be performed.  "
              (if sign
                  (epa-select-keys context
                                   "Select keys for signing.  "))))))
-  (epa-encrypt-region start end recipients sign signers))
+  ;; Don't let some read-only text stop us from encrypting.
+  (let ((inhibit-read-only t))
+    (epa-encrypt-region start end recipients sign signers)))
 
 ;;;###autoload
 (defun epa-mail-import-keys ()
diff --git a/lisp/faces.el b/lisp/faces.el
index 0011e0357a1..bdac3a1bb6a 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -1516,7 +1516,7 @@ If SPEC is nil, return nil."
   (apply 'set-face-attribute face frame
          (if (eq face 'default)
              ;; For the default face, avoid making any attribute
-             ;; unspecifed.  Instead, set attributes to default values
+             ;; unspecified.  Instead, set attributes to default values
              ;; (see also realize_default_face in xfaces.c).
              (append
               '(:underline nil :overline nil :strike-through nil
diff --git a/lisp/files.el b/lisp/files.el
index 1d54ef81869..cde15c5d0b1 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -877,14 +877,13 @@ or mount points potentially requiring authentication as a different user.")
 ;;               (setq dir nil))))
 ;;       nil)))
 
-(defun locate-dominating-file (file name &optional predicate)
+(defun locate-dominating-file (file name)
   "Look up the directory hierarchy from FILE for a file named NAME.
 Stop at the first parent directory containing a file NAME,
 and return the directory.  Return nil if not found.
 
-Optional argument PREDICATE is a function of one argument, a file.
-It should return non-nil if the file is acceptable.  The default is
-`file-exists-p'; you might, e.g., want to use `file-readable-p' instead."
+This function only tests if FILE exists.  If you care about whether
+it is readable, regular, etc., you should test the result."
   ;; We used to use the above locate-dominating-files code, but the
   ;; directory-files call is very costly, so we're much better off doing
   ;; multiple calls using the code in here.
@@ -911,8 +910,11 @@ It should return non-nil if the file is acceptable.  The default is
                     ;;   (setq user (nth 2 (file-attributes file)))
                     ;;   (and prev-user (not (equal user prev-user))))
                     (string-match locate-dominating-stop-dir-regexp file)))
-      (setq try (funcall (or predicate 'file-exists-p)
-                         (expand-file-name name file)))
+      ;; FIXME? maybe this function should (optionally?)
+      ;; use file-readable-p instead.  In many cases, an unreadable
+      ;; FILE is no better than a non-existent one.
+      ;; See eg dir-locals-find-file.
+      (setq try (file-exists-p (expand-file-name name file)))
       (cond (try (setq root file))
             ((equal file (setq file (file-name-directory
                                      (directory-file-name file))))
@@ -3550,7 +3552,7 @@ across different environments and users.")
   "Find the directory-local variables for FILE.
 This searches upward in the directory tree from FILE.
 It stops at the first directory that has been registered in
-`dir-locals-directory-cache' or contains a readable `dir-locals-file'.
+`dir-locals-directory-cache' or contains a `dir-locals-file'.
 If it finds an entry in the cache, it checks that it is valid.
 A cache entry with no modification time element (normally, one that
 has been assigned directly using `dir-locals-set-directory-class', not
@@ -3568,15 +3570,18 @@ of no valid cache entry."
           (if (eq system-type 'ms-dos)
               (dosified-file-name dir-locals-file)
             dir-locals-file))
-         ;; FIXME?  Is it right to silently ignore unreadable files?
-         (locals-file (locate-dominating-file file dir-locals-file-name
-                                              (lambda (file)
-                                                (and (file-readable-p file)
-                                                     (file-regular-p file)))))
+         (locals-file (locate-dominating-file file dir-locals-file-name))
          (dir-elt nil))
     ;; `locate-dominating-file' may have abbreviated the name.
-    (if locals-file
-        (setq locals-file (expand-file-name dir-locals-file-name locals-file)))
+    (and locals-file
+         (setq locals-file (expand-file-name dir-locals-file-name locals-file)))
+         ;; Let dir-locals-read-from-file inform us via demoted-errors
+         ;; about unreadable files, etc.
+         ;; Maybe we'd want to keep searching though - that is
+         ;; a locate-dominating-file issue.
+;;;      (or (not (file-readable-p locals-file))
+;;;          (not (file-regular-p locals-file)))
+;;;      (setq locals-file nil))
     ;; Find the best cached value in `dir-locals-directory-cache'.
     (dolist (elt dir-locals-directory-cache)
       (when (and (eq t (compare-strings file nil (length (car elt))
@@ -3618,15 +3623,19 @@ FILE is the name of the file holding the variables to apply.
 The new class name is the same as the directory in which FILE
 is found.  Returns the new class name."
   (with-temp-buffer
-    (insert-file-contents file)
-    (let* ((dir-name (file-name-directory file))
-           (class-name (intern dir-name))
-           (variables (let ((read-circle nil))
-                        (read (current-buffer)))))
-      (dir-locals-set-class-variables class-name variables)
-      (dir-locals-set-directory-class dir-name class-name
-                                      (nth 5 (file-attributes file)))
-      class-name)))
+    ;; Errors reading the file are not very informative.
+    ;; Eg just "Error: (end-of-file)" does not give any clue that the
+    ;; problem is related to dir-locals.
+    (with-demoted-errors
+      (insert-file-contents file)
+      (let* ((dir-name (file-name-directory file))
+             (class-name (intern dir-name))
+             (variables (let ((read-circle nil))
+                          (read (current-buffer)))))
+        (dir-locals-set-class-variables class-name variables)
+        (dir-locals-set-directory-class dir-name class-name
+                                        (nth 5 (file-attributes file)))
+        class-name))))
 
 (defun hack-dir-local-variables ()
   "Read per-directory local variables for the current buffer.
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index a4c1513926d..1e787642664 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,13 @@
+2012-03-12  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-int.el (gnus-backend-trace): Flip default to nil before Emacs
+        24.1 release.
+
+2012-03-10  David Edmondson  <dme@dme.org>
+
+        * mm-uu.el (mm-uu-forward-extract): Allow for blank lines between the
+        'Forwarded Message' header and the start of the message.
+
 2012-03-04  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
         * gnus-msg.el (gnus-msg-mail): Call `message-mail' correctly when Gnus
diff --git a/lisp/gnus/gnus-int.el b/lisp/gnus/gnus-int.el
index 8dc691ffe42..1190d79f778 100644
--- a/lisp/gnus/gnus-int.el
+++ b/lisp/gnus/gnus-int.el
@@ -247,7 +247,7 @@ If it is down, start it up (again)."
   (eq (nth 1 (assoc method gnus-opened-servers))
       'denied))
 
-(defvar gnus-backend-trace t)
+(defvar gnus-backend-trace nil)
 
 (defun gnus-open-server (gnus-command-method)
   "Open a connection to GNUS-COMMAND-METHOD."
diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el
index 327665bdbbf..0cf3730d095 100644
--- a/lisp/gnus/mm-uu.el
+++ b/lisp/gnus/mm-uu.el
@@ -187,7 +187,7 @@ This can be either \"inline\" or \"attachment\".")
      nil)
     (verbatim-marks
      ;; slrn-style verbatim marks, see
-     ;; http://www.slrn.org/manual/slrn-manual-6.html#ss6.81
+     ;; http://slrn.sourceforge.net/docs/slrn-manual-6.html#process_verbatim_marks
      "^#v\\+"
      "^#v\\-$"
      (lambda () (mm-uu-verbatim-marks-extract 0 0))
@@ -430,7 +430,11 @@ apply the face `mm-uu-extract'."
 
 (defun mm-uu-forward-extract ()
   (mm-make-handle (mm-uu-copy-to-buffer
-                   (progn (goto-char start-point) (forward-line) (point))
+                   (progn
+                     (goto-char start-point)
+                     (forward-line)
+                     (skip-chars-forward "\n")
+                     (point))
                    (progn (goto-char end-point) (forward-line -1) (point)))
                   '("message/rfc822" (charset . gnus-decoded))))
 
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index 17be5534138..536992f5bc8 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -2140,11 +2140,10 @@ If optional arg SILENT is non-nil, do not display progress messages."
   (unless silent
     (message "Redisplaying current buffer list..."))
   (let ((blist (ibuffer-current-state-list)))
-    (when (null blist)
-      (if (and (featurep 'ibuf-ext)
+    (when (and (null blist)
+               (featurep 'ibuf-ext)
                (or ibuffer-filtering-qualifiers ibuffer-hidden-filter-groups))
-          (message "No buffers! (note: filtering in effect)")
-        (error "No buffers!")))
+      (message "No buffers! (note: filtering in effect)"))
     (ibuffer-redisplay-engine blist t)
     (unless silent
       (message "Redisplaying current buffer list...done"))
@@ -2174,11 +2173,10 @@ If optional arg SILENT is non-nil, do not display progress messages."
                    (cadr bufs))
                  (ibuffer-current-buffers-with-marks bufs)
                  ibuffer-display-maybe-show-predicates)))
-    (when (null blist)
-      (if (and (featurep 'ibuf-ext)
-               ibuffer-filtering-qualifiers)
-          (message "No buffers! (note: filtering in effect)")
-        (error "No buffers!")))
+    (and (null blist)
+         (featurep 'ibuf-ext)
+         ibuffer-filtering-qualifiers
+         (message "No buffers! (note: filtering in effect)"))
     (unless silent
       (message "Updating buffer list..."))
     (ibuffer-redisplay-engine blist arg)
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index 561194d710c..7e893a3d751 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -58,6 +58,7 @@
         ("jisx0208" . japanese-jisx0208)
         ("jisx0201" . jisx0201)
         ("jisx0212" . japanese-jisx0212)
+        ("ksx1001" . korean-ksc5601)
         ("ksc5601.1987" . korean-ksc5601)
         ("cns11643.1992.*1" . chinese-cns11643-1)
         ("cns11643.1992.*2" . chinese-cns11643-2)
diff --git a/lisp/international/quail.el b/lisp/international/quail.el
index 48aa013c674..e0e6bfd465b 100644
--- a/lisp/international/quail.el
+++ b/lisp/international/quail.el
@@ -825,20 +825,35 @@ The format of KBD-LAYOUT is the same as `quail-keyboard-layout'."
       (setq i 0)
       (while (< i quail-keyboard-layout-len)
         (when (= (% i 30) 0)
+          ;; Insert LRO to avoid bidi-reordering of keyboard cells.
+          (insert (propertize (string ?\x202d) 'invisible t))
           (setq row (/ i 30))
           (if (> row 1)
               (insert-char 32 (+ row (/ (- row 2) 2)))))
         (setq lower (aref layout i)
               upper (aref layout (1+ i)))
         (insert bar)
-        (if (= (if (stringp lower) (string-width lower) (char-width lower)) 1)
+        (if (< (if (stringp lower) (string-width lower) (char-width lower)) 2)
             (insert " "))
-        (insert lower upper)
-        (if (= (if (stringp upper) (string-width upper) (char-width upper)) 1)
+        (if (and (characterp lower)
+                 (eq (get-char-code-property lower 'general-category) 'Mn))
+            ;; Pad the left and right of non-spacing characters.
+            (setq lower (compose-string (string lower) 0 1
+                                        (format "\t%c\t" lower))))
+        (if (and (characterp upper)
+                 (eq (get-char-code-property upper 'general-category) 'Mn))
+            ;; Pad the left and right of non-spacing characters.
+            (setq upper (compose-string (string upper) 0 1
+                                        (format "\t%c\t" upper))))
+        (insert lower (propertize " " 'invisible t) upper)
+        (if (< (if (stringp upper) (string-width upper) (char-width upper)) 2)
             (insert " "))
         (setq i (+ i 2))
         (if (= (% i 30) 0)
-            (insert bar "\n")))
+            (insert bar
+                    ;; Insert PDF to deny the previously inserted LRO.
+                    (propertize (string ?\x202c) 'invisible t)
+                    "\n")))
       ;; Insert horizontal lines while deleting blank key columns at the
       ;; beginning and end of each line.
       (save-restriction
@@ -849,20 +864,21 @@ The format of KBD-LAYOUT is the same as `quail-keyboard-layout'."
         ;;(delete-region pos (point)))
         (let ((from1 100) (to1 0) from2 to2)
           (while (not (eobp))
-            (if (looking-at "[| ]*$")
+            (if (looking-at "[| \u202c\u202d]*$")
                 ;; The entire row is blank.
                 (delete-region (point) (match-end 0))
               ;; Delete blank key columns at the head.
-              (if (looking-at " *\\(|    \\)+")
+              (if (looking-at "\u202d? *\\(|     \\)+")
                   (subst-char-in-region (point) (match-end 0) ?| ? ))
               ;; Delete blank key columns at the tail.
-              (if (re-search-forward "\\(    |\\)+$" (line-end-position) t)
+              (if (re-search-forward "\\(     |\\)+\u202c?$"
+                                     (line-end-position) t)
                   (delete-region (match-beginning 0) (point)))
               (beginning-of-line))
             ;; Calculate the start and end columns of a horizontal line.
             (if (eolp)
                 (setq from2 from1 to2 to1)
-              (skip-chars-forward " ")
+              (skip-chars-forward " \u202d")
               (setq from2 (current-column))
               (end-of-line)
               (setq to2 (current-column))
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index a20201fb529..9059da817b6 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -63,12 +63,16 @@ from START (inclusive) to END (exclusive)."
 
 ;;;###autoload
 (defun mail-quote-printable (string &optional wrapper)
-  "Convert a string to the \"quoted printable\" Q encoding.
+  "Convert a string to the \"quoted printable\" Q encoding if necessary.
+If the string contains only ASCII characters and no troublesome ones,
+we return it unconverted.
+
 If the optional argument WRAPPER is non-nil,
 we add the wrapper characters =?ISO-8859-1?Q?....?=."
   (let ((i 0) (result ""))
     (save-match-data
-      (while (string-match "[?=\"\200-\377]" string i)
+      (while (or (string-match "[?=\"]" string i)
+                 (string-match "[^\000-\177]" string i))
         (setq result
               (concat result (substring string i (match-beginning 0))
                       (upcase (format "=%02x"
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 2d327c7a0f0..3a9ba8122ab 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1363,8 +1363,7 @@ sets the current buffer's `buffer-file-coding-system' to that of
 (defun rmail-buffers-swapped-p ()
   "Return non-nil if the message collection is in `rmail-view-buffer'."
   ;; This is analogous to tar-data-swapped-p in tar-mode.el.
-  (and (buffer-live-p rmail-view-buffer)
-       rmail-buffer-swapped))
+  rmail-buffer-swapped)
 
 (defun rmail-change-major-mode-hook ()
   ;; Bring the actual Rmail messages back into the main buffer.
@@ -1406,7 +1405,8 @@ If so restore the actual mbox message collection."
         (kill-buffer rmail-view-buffer))))
 
 (defun rmail-view-buffer-kill-buffer-hook ()
-  (error "Can't kill message view buffer by itself"))
+  (error "Can't kill Rmail view buffer `%s' by itself"
+         (buffer-name (current-buffer))))
 
 ;; Set up the permanent locals associated with an Rmail file.
 (defun rmail-perm-variables ()
@@ -4472,7 +4472,11 @@ encoded string (and the same mask) will decode the string."
 
 ;; Used in `write-region-annotate-functions' to write rmail files.
 (defun rmail-write-region-annotate (start end)
-  (when (and (null start) (rmail-buffers-swapped-p))
+  (when (and (null start) rmail-buffer-swapped)
+    (unless (buffer-live-p rmail-view-buffer)
+      (error "Buffer `%s' with real text of `%s' has disappeared"
+             (buffer-name rmail-view-buffer)
+             (buffer-name (current-buffer))))
     (setq rmail-message-encoding buffer-file-coding-system)
     (set-buffer rmail-view-buffer)
     (widen)
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index 91e0b183a68..f4dfcfcf647 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -1085,7 +1085,9 @@ Return non-nil if and only if some part of the header is encoded."
                 (cons selected mm-coding-system-priorities)
               mm-coding-system-priorities))
            (tick (buffer-chars-modified-tick))
-           (rfc2047-encode-encoded-words nil))
+           ;; rms: this proved necessary, but I don't recall why.
+           ;; Can anyone determine why, and state it here?
+           (rfc2047-encode-encoded-words t))
       (rfc2047-encode-message-header)
       (= tick (buffer-chars-modified-tick)))))
 
diff --git a/lisp/mail/smtpmail.el b/lisp/mail/smtpmail.el
index 3233cff2768..8e96e2c9438 100644
--- a/lisp/mail/smtpmail.el
+++ b/lisp/mail/smtpmail.el
@@ -324,7 +324,10 @@ The list is in preference order.")
             (if (re-search-forward "^FCC:" delimline t)
                 ;; Force `mail-do-fcc' to use the encoding of the mail
                 ;; buffer to encode outgoing messages on FCC files.
-                (let ((coding-system-for-write smtpmail-code-conv-from))
+                (let ((coding-system-for-write
+                       ;; mbox files must have Unix EOLs.
+                       (coding-system-change-eol-conversion
+                        smtpmail-code-conv-from 'unix)))
                   (mail-do-fcc delimline)))
             (if mail-interactive
                 (with-current-buffer errbuf
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 1fdf33bf610..6a6bba13523 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -162,7 +162,7 @@ Like CL's `some'."
 (defun complete-with-action (action table string pred)
   "Perform completion ACTION.
 STRING is the string to complete.
-TABLE is the completion table, which should not be a function.
+TABLE is the completion table.
 PRED is a completion predicate.
 ACTION can be one of nil, t or `lambda'."
   (cond
@@ -776,7 +776,8 @@ scroll the window of possible completions."
   (interactive)
   ;; If the previous command was not this,
   ;; mark the completion buffer obsolete.
-  (unless (eq this-command last-command)
+  (setq this-command 'completion-at-point)
+  (unless (eq 'completion-at-point last-command)
     (completion--flush-all-sorted-completions)
     (setq minibuffer-scroll-window nil))
 
@@ -1483,10 +1484,13 @@ exit."
           (minibuffer-completion-predicate predicate)
           (ol (make-overlay start end nil nil t)))
       (overlay-put ol 'field 'completion)
+      ;; HACK: if the text we are completing is already in a field, we
+      ;; want the completion field to take priority (e.g. Bug#6830).
+      (overlay-put ol 'priority 100)
       (when completion-in-region-mode-predicate
         (completion-in-region-mode 1)
         (setq completion-in-region--data
-            (list (current-buffer) start end collection)))
+              (list (current-buffer) start end collection)))
       (unwind-protect
           (call-interactively 'minibuffer-complete)
         (delete-overlay ol)))))
@@ -1653,9 +1657,10 @@ The completion method is determined by `completion-at-point-functions'."
         ;; introduce a corresponding hook (plus another for word-completion,
         ;; and another for force-completion, maybe?).
         (overlay-put ol 'field 'completion)
+        (overlay-put ol 'priority 100)
         (completion-in-region-mode 1)
         (setq completion-in-region--data
-            (list (current-buffer) start end collection))
+              (list (current-buffer) start end collection))
         (unwind-protect
             (call-interactively 'minibuffer-completion-help)
           (delete-overlay ol))))
diff --git a/lisp/net/dbus.el b/lisp/net/dbus.el
index fbc83bf1df0..feef78a305f 100644
--- a/lisp/net/dbus.el
+++ b/lisp/net/dbus.el
@@ -1039,7 +1039,8 @@ It will be registered for all objects created by `dbus-register-object'."
                     (car (last key))
                     (list :variant (cdar (last (car val))))))))
          dbus-registered-objects-table)
-        (list result))))))
+        ;; Return the result, or an empty array.
+        (list :array (or result '(:signature "{sv}"))))))))
 
  
 ;; Initialize :system and :session buses.  This adds their file
diff --git a/lisp/net/mairix.el b/lisp/net/mairix.el
index 84343b7de00..a8e969a18c5 100644
--- a/lisp/net/mairix.el
+++ b/lisp/net/mairix.el
@@ -570,10 +570,10 @@ whole threads.  Function returns t if messages were found."
                mairix-output-buffer)))
     (zerop rval)))
 
-(defun mairix-replace-illegal-chars (header)
-  "Replace illegal characters in HEADER for mairix query."
+(defun mairix-replace-invalid-chars (header)
+  "Replace invalid characters in HEADER for mairix query."
   (when header
-    (while (string-match "[^-.@/,& [:alnum:]]" header)
+    (while (string-match "[^-.@/,^=~& [:alnum:]]" header)
       (setq header (replace-match "" t t header)))
     (while (string-match "[& ]" header)
       (setq header (replace-match "," t t header)))
@@ -620,7 +620,7 @@ See %s for details" mairix-output-buffer)))
          (concat
           (nth 1 cur)
           ":"
-          (mairix-replace-illegal-chars
+          (mairix-replace-invalid-chars
            (widget-value
            (cadr (assoc (concat "e" (car (cddr cur))) widgets)))))
          query)))
@@ -652,9 +652,17 @@ Fill in VALUES if based on an article."
     (kill-all-local-variables)
     (erase-buffer)
     (widget-insert
-     "Specify your query for Mairix (check boxes for activating fields):\n\n")
+     "Specify your query for Mairix using check boxes for activating fields.\n\n")
     (widget-insert
-     "(Whitespaces will be converted to ',' (i.e. AND). Use '/' for OR.)\n\n")
+     (concat "Use ~word        to match messages "
+             (propertize "not" 'face 'italic)
+             " containing the word)\n"
+             "    substring=   to match words containing the substring\n"
+             "    substring=N  to match words containing the substring, allowing\n"
+             "                  up to N errors(missing/extra/different letters)\n"
+             "    ^substring=  to match the substring at the beginning of a word.\n"))
+    (widget-insert
+     "Whitespace will be converted to ',' (i.e. AND).  Use '/' for OR.\n\n")
     (setq mairix-widgets (mairix-widget-build-editable-fields values))
     (when (member 'flags mairix-widget-other)
       (widget-insert "\nFlags:\n      Seen:     ")
@@ -935,7 +943,7 @@ Use cursor keys or C-n,C-p to select next/previous search.\n\n")
               (lambda (field)
                 (list (car (cddr field))
                       (if (car field)
-                          (mairix-replace-illegal-chars
+                          (mairix-replace-invalid-chars
                            (funcall get-mail-header (car field)))
                         nil))))
              mairix-widget-fields-list)))
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index a22288e7d4e..f9122e7245e 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -86,18 +86,9 @@ as the first attribute on the previous line."
   :group 'nxml
   :type 'integer)
 
-(defcustom nxml-bind-meta-tab-to-complete-flag (not window-system)
-  "Non-nil means bind M-TAB in `nxml-mode-map' to `nxml-complete'.
-C-return will be bound to `nxml-complete' in any case.
-M-TAB gets swallowed by many window systems/managers, and
-`documentation' will show M-TAB rather than C-return as the
-binding for `nxml-complete' when both are bound.  So it's better
-to bind M-TAB only when it will work."
+(defcustom nxml-bind-meta-tab-to-complete-flag t
+  "Non-nil means to use nXML completion in \\[completion-at-point]."
   :group 'nxml
-  :set (lambda (sym flag)
-         (set-default sym flag)
-         (when (and (boundp 'nxml-mode-map) nxml-mode-map)
-           (define-key nxml-mode-map "\M-\t" (and flag 'nxml-complete))))
   :type 'boolean)
 
 (defcustom nxml-prefer-utf-16-to-utf-8-flag nil
@@ -418,9 +409,7 @@ reference.")
     (define-key map "\C-c\C-o" nxml-outline-prefix-map)
     (define-key map [S-mouse-2] 'nxml-mouse-hide-direct-text-content)
     (define-key map "/" 'nxml-electric-slash)
-    (define-key map [C-return] 'nxml-complete)
-    (when nxml-bind-meta-tab-to-complete-flag
-      (define-key map "\M-\t" 'nxml-complete))
+    (define-key map "\M-\t" 'completion-at-point)
     map)
   "Keymap for nxml-mode.")
 
@@ -479,7 +468,7 @@ the start-tag, point, and end-tag are all left on separate lines.
 If `nxml-slash-auto-complete-flag' is non-nil, then inserting a `</'
 automatically inserts the rest of the end-tag.
 
-\\[nxml-complete] performs completion on the symbol preceding point.
+\\[completion-at-point] performs completion on the symbol preceding point.
 
 \\[nxml-dynamic-markup-word] uses the contents of the current buffer
 to choose a tag to put around the word preceding point.
@@ -555,6 +544,8 @@ Many aspects this mode can be customized using
         (nxml-clear-inside (point-min) (point-max))
         (nxml-with-invisible-motion
           (nxml-scan-prolog)))))
+  (add-hook 'completion-at-point-functions
+            #'nxml-completion-at-point-function nil t)
   (add-hook 'after-change-functions 'nxml-after-change nil t)
   (add-hook 'change-major-mode-hook 'nxml-cleanup nil t)
 
@@ -1654,6 +1645,11 @@ depend on `nxml-completion-hook'."
     (ding)
     (message "Cannot complete in this context")))
 
+(defun nxml-completion-at-point-function ()
+  "Call `nxml-complete' to perform completion at point."
+  (when nxml-bind-meta-tab-to-complete-flag
+    #'nxml-complete))
+
 ;;; Movement
 
 (defun nxml-forward-balanced-item (&optional arg)
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el
index 509bb203f78..55ab6c9981c 100644
--- a/lisp/progmodes/cc-cmds.el
+++ b/lisp/progmodes/cc-cmds.el
@@ -1958,7 +1958,12 @@ with a brace block."
 
 (defun c-mark-function ()
   "Put mark at end of the current top-level declaration or macro, point at beginning.
-If point is not inside any then the closest following one is chosen.
+If point is not inside any then the closest following one is
+chosen.  Each successive call of this command extends the marked
+region by one function.
+
+A mark is left where the command started, unless the region is already active
+\(in Transient Mark mode).
 
 As opposed to \\[c-beginning-of-defun] and \\[c-end-of-defun], this
 function does not require the declaration to contain a brace block."
@@ -1974,8 +1979,24 @@ function does not require the declaration to contain a brace block."
 
     (if (not decl-limits)
         (error "Cannot find any declaration")
-      (goto-char (car decl-limits))
-      (push-mark (cdr decl-limits) nil t))))
+      (let* ((extend-region-p
+              (and (eq this-command 'c-mark-function)
+                   (eq last-command 'c-mark-function)))
+             (push-mark-p (and (eq this-command 'c-mark-function)
+                               (not extend-region-p)
+                               (not (and transient-mark-mode mark-active)))))
+        (if push-mark-p (push-mark (point)))
+        (if extend-region-p
+            (progn
+              (exchange-point-and-mark)
+              (setq decl-limits (c-declaration-limits t))
+              (when (not decl-limits)
+                (exchange-point-and-mark)
+                (error "Cannot find any declaration"))
+              (goto-char (cdr decl-limits))
+              (exchange-point-and-mark))
+          (goto-char (car decl-limits))
+          (push-mark (cdr decl-limits) nil t))))))
 
 (defun c-cpp-define-name ()
   "Return the name of the current CPP macro, or NIL if we're not in one."
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index 3b33ac894f2..f392971e7d1 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -236,7 +236,7 @@
 
 (defun c-invalidate-macro-cache (beg end)
   ;; Called from a before-change function.  If the change region is before or
-  ;; in the macro characterised by `c-macro-cache' etc., nullify it
+  ;; in the macro characterized by `c-macro-cache' etc., nullify it
   ;; appropriately.  BEG and END are the standard before-change-functions
   ;; parameters.  END isn't used.
   (cond
@@ -2163,7 +2163,7 @@ comment at the start of cc-engine.el for more info."
 (make-variable-buffer-local 'c-state-semi-nonlit-pos-cache-limit)
 ;; An upper limit on valid entries in `c-state-semi-nonlit-pos-cache'.  This is
 ;; reduced by buffer changes, and increased by invocations of
-;; `c-state-literal-at'.  FIMXE!!!
+;; `c-state-literal-at'.  FIXME!!!
 
 (defsubst c-state-pp-to-literal (from to)
   ;; Do a parse-partial-sexp from FROM to TO, returning either
diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el
index 8ea255e49dd..89450cd2276 100644
--- a/lisp/progmodes/gdb-mi.el
+++ b/lisp/progmodes/gdb-mi.el
@@ -3269,8 +3269,12 @@ DOC is an optional documentation string."
   (let* ((frame (gdb-current-buffer-frame))
          (file (bindat-get-field frame 'fullname))
          (line (bindat-get-field frame 'line)))
-    (when file
-      (format "-data-disassemble -f %s -l %s -n -1 -- 0" file line)))
+    (if file
+      (format "-data-disassemble -f %s -l %s -n -1 -- 0" file line)
+    ;; If we're unable to get a file name / line for $PC, simply
+    ;; follow $PC, disassembling the next 10 (x ~15 (on IA) ==
+    ;; 150 bytes) instructions.
+    "-data-disassemble -s $pc -e \"$pc + 150\" -- 0"))
   gdb-disassembly-handler
   ;; We update disassembly only after we have actual frame information
   ;; about all threads, so no there's `update' signal in this list
@@ -3329,8 +3333,12 @@ DOC is an optional documentation string."
       (gdb-table-add-row table
                          (list
                           (bindat-get-field instr 'address)
-                          (apply #'format "<%s+%s>:"
-                                 (gdb-get-many-fields instr 'func-name 'offset))
+                          (let
+                              ((func-name (bindat-get-field instr 'func-name))
+                               (offset (bindat-get-field instr 'offset)))
+                            (if func-name
+                                (format "<%s+%s>:" func-name offset)
+                              ""))
                           (bindat-get-field instr 'inst)))
       (when (string-equal (bindat-get-field instr 'address)
                           address)
diff --git a/lisp/replace.el b/lisp/replace.el
index 349e63d4201..9fbaa279079 100644
--- a/lisp/replace.el
+++ b/lisp/replace.el
@@ -2116,13 +2116,13 @@ make, or the user didn't cancel the call."
   (if query-replace-lazy-highlight
       (let ((isearch-string string)
             (isearch-regexp regexp)
+            ;; Set isearch-word to nil because word-replace is regexp-based,
+            ;; so `isearch-search-fun' should not use `word-search-forward'.
+            (isearch-word nil)
             (search-whitespace-regexp nil)
             (isearch-case-fold-search case-fold)
             (isearch-forward t)
             (isearch-error nil))
-        ;; Set isearch-word to nil because word-replace is regexp-based,
-        ;; so `isearch-search-fun' should not use `word-search-forward'.
-        (if (and isearch-word isearch-regexp) (setq isearch-word nil))
         (isearch-lazy-highlight-new-loop range-beg range-end))))
 
 (defun replace-dehighlight ()
diff --git a/lisp/savehist.el b/lisp/savehist.el
index c1515fa48ce..a65906a1676 100644
--- a/lisp/savehist.el
+++ b/lisp/savehist.el
@@ -369,9 +369,11 @@ trimming of history lists to `history-length' items."
   "Return non-nil if VALUE is printable."
   (cond
    ;; Quick response for oft-encountered types known to be printable.
-   ((stringp value))
    ((numberp value))
    ((symbolp value))
+   ;; String without properties
+   ((and (stringp value)
+         (equal-including-properties value (substring-no-properties value))))
    (t
     ;; For others, check explicitly.
     (with-temp-buffer
diff --git a/lisp/server.el b/lisp/server.el
index 34ac5d7ba23..ed83225eccd 100644
--- a/lisp/server.el
+++ b/lisp/server.el
@@ -706,9 +706,29 @@ Server mode runs a process that accepts commands from the
           (pp v)
           (let ((text (buffer-substring-no-properties
                        (point-min) (point-max))))
-            (server-send-string
-             proc (format "-print %s\n"
-                          (server-quote-arg text)))))))))
+            (server-reply-print (server-quote-arg text) proc)))))))
+
+(defconst server-msg-size 1024
+  "Maximum size of a message sent to a client.")
+
+(defun server-reply-print (qtext proc)
+  "Send a `-print QTEXT' command to client PROC.
+QTEXT must be already quoted.
+This handles splitting the command if it would be bigger than
+`server-msg-size'."
+  (let ((prefix "-print ")
+        part)
+    (while (> (+ (length qtext) (length prefix) 1) server-msg-size)
+      ;; We have to split the string
+      (setq part (substring qtext 0 (- server-msg-size (length prefix) 1)))
+      ;; Don't split in the middle of a quote sequence
+      (if (string-match "\\(^\\|[^&]\\)\\(&&\\)+$" part)
+          ;; There is an uneven number of & at the end
+          (setq part (substring part 0 -1)))
+      (setq qtext (substring qtext (length part)))
+      (server-send-string proc (concat prefix part "\n"))
+      (setq prefix "-print-nonl "))
+    (server-send-string proc (concat prefix qtext "\n"))))
 
 (defun server-create-tty-frame (tty type proc)
   (unless tty
@@ -911,6 +931,11 @@ The following commands are accepted by the client:
   Print STRING on stdout.  Used to send values
   returned by -eval.
 
+`-print-nonl STRING'
+  Print STRING on stdout.  Used to continue a
+  preceding -print command that would be too big to send
+  in a single message.
+
 `-error DESCRIPTION'
   Signal an error and delete process PROC.
 
@@ -1534,46 +1559,54 @@ only these files will be asked to be saved."
 Returns the result of the evaluation, or signals an error if it
 cannot contact the specified server.  For example:
   \(server-eval-at \"server\" '(emacs-pid))
-returns the process ID of the Emacs instance running \"server\".
-This function requires the use of TCP sockets. "
-  (or server-use-tcp
-      (error "This function requires TCP sockets"))
-  (let ((auth-file (expand-file-name server server-auth-dir))
-        (coding-system-for-read 'binary)
-        (coding-system-for-write 'binary)
-        address port secret process)
-    (unless (file-exists-p auth-file)
-      (error "No such server definition: %s" auth-file))
+returns the process ID of the Emacs instance running \"server\"."
+  (let* ((server-dir (if server-use-tcp server-auth-dir server-socket-dir))
+         (server-file (expand-file-name server server-dir))
+         (coding-system-for-read 'binary)
+         (coding-system-for-write 'binary)
+         address port secret process)
+    (unless (file-exists-p server-file)
+      (error "No such server: %s" server))
     (with-temp-buffer
-      (insert-file-contents auth-file)
-      (unless (looking-at "\\([0-9.]+\\):\\([0-9]+\\)")
-        (error "Invalid auth file"))
-      (setq address (match-string 1)
-            port (string-to-number (match-string 2)))
-      (forward-line 1)
-      (setq secret (buffer-substring (point) (line-end-position)))
-      (erase-buffer)
-      (unless (setq process (open-network-stream "eval-at" (current-buffer)
-                                                 address port))
-        (error "Unable to contact the server"))
-      (set-process-query-on-exit-flag process nil)
-      (process-send-string
-       process
-       (concat "-auth " secret " -eval "
-               (replace-regexp-in-string
-                " " "&_" (format "%S" form))
-               "\n"))
+      (when server-use-tcp
+        (let ((coding-system-for-read 'no-conversion))
+          (insert-file-contents server-file)
+          (unless (looking-at "\\([0-9.]+\\):\\([0-9]+\\)")
+            (error "Invalid auth file"))
+          (setq address (match-string 1)
+                port (string-to-number (match-string 2)))
+          (forward-line 1)
+          (setq secret (buffer-substring (point) (line-end-position)))
+          (erase-buffer)))
+      (unless (setq process (make-network-process
+                             :name "eval-at"
+                             :buffer (current-buffer)
+                             :host address
+                             :service (if server-use-tcp port server-file)
+                             :family (if server-use-tcp 'ipv4 'local)
+                             :noquery t))
+               (error "Unable to contact the server"))
+      (if server-use-tcp
+          (process-send-string process (concat "-auth " secret "\n")))
+      (process-send-string process
+                           (concat "-eval "
+                                   (server-quote-arg (format "%S" form))
+                                   "\n"))
       (while (memq (process-status process) '(open run))
         (accept-process-output process 0 10))
       (goto-char (point-min))
       ;; If the result is nil, there's nothing in the buffer.  If the
       ;; result is non-nil, it's after "-print ".
-      (when (search-forward "\n-print" nil t)
-        (let ((start (point)))
-          (while (search-forward "&_" nil t)
-            (replace-match " " t t))
-          (goto-char start)
-          (read (current-buffer)))))))
+      (let ((answer ""))
+        (while (re-search-forward "\n-print\\(-nonl\\)? " nil t)
+          (setq answer
+                (concat answer
+                        (buffer-substring (point)
+                                          (progn (skip-chars-forward "^\n")
+                                                 (point))))))
+        (if (not (equal answer ""))
+            (read (decode-coding-string (server-unquote-arg answer)
+                                        'emacs-internal)))))))
 
 
 (provide 'server)
diff --git a/lisp/simple.el b/lisp/simple.el
index 45daf99f614..936037f5caa 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -893,16 +893,23 @@ that uses or sets the mark."
 ;; Counting lines, one way or another.
 
 (defun goto-line (line &optional buffer)
-  "Goto LINE, counting from line 1 at beginning of buffer.
-Normally, move point in the current buffer, and leave mark at the
-previous position.  With just \\[universal-argument] as argument,
-move point in the most recently selected other buffer, and switch to it.
+  "Go to LINE, counting from line 1 at beginning of buffer.
+If called interactively, a numeric prefix argument specifies
+LINE; without a numeric prefix argument, read LINE from the
+minibuffer.
+
+If optional argument BUFFER is non-nil, switch to that buffer and
+move to line LINE there.  If called interactively with \\[universal-argument]
+as argument, BUFFER is the most recently selected other buffer.
 
-If there's a number in the buffer at point, it is the default for LINE.
+Prior to moving point, this function sets the mark (without
+activating it), unless Transient Mark mode is enabled and the
+mark is already active.
 
 This function is usually the wrong thing to use in a Lisp program.
 What you probably want instead is something like:
-  (goto-char (point-min)) (forward-line (1- N))
+  (goto-char (point-min))
+  (forward-line (1- N))
 If at all possible, an even better solution is to use char counts
 rather than line counts."
   (interactive
@@ -3062,7 +3069,8 @@ before the Emacs kill and one can still paste it using \\[yank] \\[yank-pop]."
   :version "23.2")
 
 (defcustom kill-do-not-save-duplicates nil
-  "Do not add a new string to `kill-ring' when it is the same as the last one."
+  "Do not add a new string to `kill-ring' if it duplicates the last one.
+The comparison is done using `equal-including-properties'."
   :type 'boolean
   :group 'killing
   :version "23.2")
@@ -3090,7 +3098,10 @@ argument should still be a \"useful\" string for such uses."
         (signal 'args-out-of-range
                 (list string "yank-handler specified for empty string"))))
   (unless (and kill-do-not-save-duplicates
-               (equal string (car kill-ring)))
+               ;; Due to text properties such as 'yank-handler that
+               ;; can alter the contents to yank, comparison using
+               ;; `equal' is unsafe.
+               (equal-including-properties string (car kill-ring)))
     (if (fboundp 'menu-bar-update-yank-menu)
         (menu-bar-update-yank-menu string (and replace (car kill-ring)))))
   (when save-interprogram-paste-before-kill
@@ -3101,10 +3112,10 @@ argument should still be a \"useful\" string for such uses."
                        (nreverse interprogram-paste)
                      (list interprogram-paste)))
           (unless (and kill-do-not-save-duplicates
-                       (equal s (car kill-ring)))
+                       (equal-including-properties s (car kill-ring)))
             (push s kill-ring))))))
   (unless (and kill-do-not-save-duplicates
-               (equal string (car kill-ring)))
+               (equal-including-properties string (car kill-ring)))
     (if (and replace kill-ring)
         (setcar kill-ring string)
       (push string kill-ring)
diff --git a/lisp/sort.el b/lisp/sort.el
index d38e475fd39..8cfe69f9458 100644
--- a/lisp/sort.el
+++ b/lisp/sort.el
@@ -423,7 +423,7 @@ For example: to sort lines in the region by the first word on each line
   ;; using negative prefix arg to mean "reverse" is now inconsistent with
   ;; other sort-.*fields functions but then again this was before, since it
   ;; didn't use the magnitude of the arg to specify anything.
-  (interactive "P\nsRegexp specifying records to sort:
+  (interactive "P\nsRegexp specifying records to sort: \n\
 sRegexp specifying key within record: \nr")
   (cond ((or (equal key-regexp "") (equal key-regexp "\\&"))
          (setq key-regexp 0))
diff --git a/lisp/speedbar.el b/lisp/speedbar.el
index 89211b2b86e..bb1debb4552 100644
--- a/lisp/speedbar.el
+++ b/lisp/speedbar.el
@@ -3987,11 +3987,11 @@ TEXT is the buffer's name, TOKEN and INDENT are unused."
 
 (defun speedbar-unhighlight-one-tag-line ()
   "Unhighlight the currently highlighted line."
-  (if speedbar-highlight-one-tag-line
-      (progn
-        (speedbar-delete-overlay speedbar-highlight-one-tag-line)
-        (setq speedbar-highlight-one-tag-line nil)))
-  (remove-hook 'pre-command-hook 'speedbar-unhighlight-one-tag-line))
+  (when (and speedbar-highlight-one-tag-line
+             (not (eq this-command 'handle-switch-frame)))
+    (speedbar-delete-overlay speedbar-highlight-one-tag-line)
+    (setq speedbar-highlight-one-tag-line nil)
+    (remove-hook 'pre-command-hook 'speedbar-unhighlight-one-tag-line)))
 
 (defun speedbar-recenter-to-top ()
   "Recenter the current buffer so point is on the top of the window."
diff --git a/lisp/subr.el b/lisp/subr.el
index 00a030c744c..e0b099dd16b 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -3026,13 +3026,12 @@ the buffer list."
            (set-buffer ,old-buffer))))))
 
 (defmacro save-window-excursion (&rest body)
-  "Execute BODY, preserving window sizes and contents.
-Return the value of the last form in BODY.
-Restore which buffer appears in which window, where display starts,
-and the value of point and mark for each window.
-Also restore the choice of selected window.
-Also restore which buffer is current.
-Does not restore the value of point in current buffer.
+  "Execute BODY, then restore previous window configuration.
+This macro saves the window configuration on the selected frame,
+executes BODY, then calls `set-window-configuration' to restore
+the saved window configuration.  The return value is the last
+form in BODY.  The window configuration is also restored if BODY
+exits nonlocally.
 
 BEWARE: Most uses of this macro introduce bugs.
 E.g. it should not be used to try and prevent some code from opening
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 55aa9194904..960649bdbc9 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,14 @@
+2012-03-11  Chong Yidong  <cyd@gnu.org>
+
+        * url-http.el (url-http-end-of-document-sentinel): Handle
+        keepalive expiry by calling url-http again (Bug#10223).
+        (url-http): New arg, for the above.
+
+2012-03-11  Devon Sean McCullough  <emacs-hacker2012@jovi.net>
+
+        * url-http.el (url-http-find-free-connection): Don't pass a nil
+        argument to url-http-mark-connection-as-busy (bug#10891).
+
 2012-02-20  Lars Ingebrigtsen  <larsi@gnus.org>
 
         * url-queue.el (url-queue-kill-job): Delete the process sentinel
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 0c911260ca5..a4726489814 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -27,6 +27,7 @@
 (eval-when-compile (require 'cl))
 (defvar url-http-extra-headers)
 (defvar url-http-target-url)
+(defvar url-http-no-retry)
 (defvar url-http-proxy)
 (defvar url-http-connection-opened)
 (require 'url-gw)
@@ -153,38 +154,40 @@ request.")
 
 (defun url-http-find-free-connection (host port)
   (let ((conns (gethash (cons host port) url-http-open-connections))
-        (found nil))
-    (while (and conns (not found))
+        (connection nil))
+    (while (and conns (not connection))
       (if (not (memq (process-status (car conns)) '(run open connect)))
           (progn
             (url-http-debug "Cleaning up dead process: %s:%d %S"
                             host port (car conns))
             (url-http-idle-sentinel (car conns) nil))
-        (setq found (car conns))
-        (url-http-debug "Found existing connection: %s:%d %S" host port found))
+        (setq connection (car conns))
+        (url-http-debug "Found existing connection: %s:%d %S" host port connection))
       (pop conns))
-    (if found
+    (if connection
         (url-http-debug "Reusing existing connection: %s:%d" host port)
       (url-http-debug "Contacting host: %s:%d" host port))
     (url-lazy-message "Contacting host: %s:%d" host port)
-    (url-http-mark-connection-as-busy
-     host port
-     (or found
-         (let ((buf (generate-new-buffer " *url-http-temp*")))
-           ;; `url-open-stream' needs a buffer in which to do things
-           ;; like authentication.  But we use another buffer afterwards.
-           (unwind-protect
-               (let ((proc (url-open-stream host buf host port)))
-                 ;; url-open-stream might return nil.
-                 (when (processp proc)
-                   ;; Drop the temp buffer link before killing the buffer.
-                   (set-process-buffer proc nil))
-                 proc)
-             ;; If there was an error on connect, make sure we don't
-             ;; get queried.
-             (when (get-buffer-process buf)
-               (set-process-query-on-exit-flag (get-buffer-process buf) nil))
-             (kill-buffer buf)))))))
+
+    (unless connection
+      (let ((buf (generate-new-buffer " *url-http-temp*")))
+        ;; `url-open-stream' needs a buffer in which to do things
+        ;; like authentication.  But we use another buffer afterwards.
+        (unwind-protect
+            (let ((proc (url-open-stream host buf host port)))
+              ;; url-open-stream might return nil.
+              (when (processp proc)
+                ;; Drop the temp buffer link before killing the buffer.
+                (set-process-buffer proc nil)
+                (setq connection proc)))
+          ;; If there was an error on connect, make sure we don't
+          ;; get queried.
+          (when (get-buffer-process buf)
+            (set-process-query-on-exit-flag (get-buffer-process buf) nil))
+          (kill-buffer buf))))
+
+    (if connection
+        (url-http-mark-connection-as-busy host port connection))))
 
 ;; Building an HTTP request
 (defun url-http-user-agent-string ()
@@ -873,19 +876,26 @@ should be shown to the user."
               url-http-open-connections))
 
 (defun url-http-end-of-document-sentinel (proc why)
-  ;; Sentinel used for old HTTP/0.9 or connections we know are going
-  ;; to die as the 'end of document' notifier.
+  ;; Sentinel used to handle (i) terminated old HTTP/0.9 connections,
+  ;; and (ii) closed connection due to reusing a HTTP connection which
+  ;; we believed was still alive, but which the server closed on us.
+  ;; We handle case (ii) by calling `url-http' again.
   (url-http-debug "url-http-end-of-document-sentinel in buffer (%s)"
                   (process-buffer proc))
   (url-http-idle-sentinel proc why)
   (when (buffer-name (process-buffer proc))
     (with-current-buffer (process-buffer proc)
       (goto-char (point-min))
-      (if (not (looking-at "HTTP/"))
-          ;; HTTP/0.9 just gets passed back no matter what
-          (url-http-activate-callback)
-        (if (url-http-parse-headers)
-            (url-http-activate-callback))))))
+      (cond ((not (looking-at "HTTP/"))
+             (if url-http-no-retry
+                 ;; HTTP/0.9 just gets passed back no matter what
+                 (url-http-activate-callback)
+               ;; Call `url-http' again if our connection expired.
+               (erase-buffer)
+               (url-http url-current-object url-callback-function
+                         url-callback-arguments (current-buffer))))
+            ((url-http-parse-headers)
+             (url-http-activate-callback))))))
 
 (defun url-http-simple-after-change-function (st nd length)
   ;; Function used when we do NOT know how long the document is going to be
@@ -1163,11 +1173,14 @@ the end of the document."
       (goto-char (point-max)))))
 
 ;;;###autoload
-(defun url-http (url callback cbargs)
+(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."
+CBARGS as the arguments.
+
+Optional arg RETRY-BUFFER, if non-nil, specifies the buffer of a
+previous `url-http' call, which is being re-attempted."
   (check-type url vector "Need a pre-parsed URL.")
   (declare (special url-current-object
                     url-http-end-of-headers
@@ -1188,7 +1201,8 @@ CBARGS as the arguments."
   (let* ((host (url-host (or url-using-proxy url)))
          (port (url-port (or url-using-proxy url)))
          (connection (url-http-find-free-connection host port))
-         (buffer (generate-new-buffer (format " *http %s:%d*" host port))))
+         (buffer (or retry-buffer
+                     (generate-new-buffer (format " *http %s:%d*" host port)))))
     (if (not connection)
         ;; Failed to open the connection for some reason
         (progn
@@ -1218,6 +1232,7 @@ CBARGS as the arguments."
                        url-http-extra-headers
                        url-http-data
                        url-http-target-url
+                       url-http-no-retry
                        url-http-connection-opened
                        url-http-proxy))
           (set (make-local-variable var) nil))
@@ -1233,6 +1248,7 @@ CBARGS as the arguments."
               url-callback-arguments cbargs
               url-http-after-change-function 'url-http-wait-for-headers-change-function
               url-http-target-url url-current-object
+              url-http-no-retry retry-buffer
               url-http-connection-opened nil
               url-http-proxy url-using-proxy)
 
@@ -1259,6 +1275,7 @@ CBARGS as the arguments."
     (with-current-buffer (process-buffer proc)
       (cond
        (url-http-connection-opened
+        (setq url-http-no-retry t)
         (url-http-end-of-document-sentinel proc why))
        ((string= (substring why 0 4) "open")
         (setq url-http-connection-opened t)
diff --git a/lisp/window.el b/lisp/window.el
index edd8a113876..f79041e0e6c 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3273,7 +3273,7 @@ Otherwise, the window starts are chosen so as to minimize the
 amount of redisplay; this is convenient on slow terminals."
   (interactive "P")
   (let ((old-window (selected-window))
-        (old-point (point))
+        (old-point (window-point-1))
         (size (and size (prefix-numeric-value size)))
         moved-by-window-height moved new-window bottom)
     (when (and size (< size 0) (< (- size) window-min-height))
@@ -3282,22 +3282,27 @@ amount of redisplay; this is convenient on slow terminals."
     (setq new-window (split-window nil size))
     (unless split-window-keep-point
       (with-current-buffer (window-buffer)
-        (goto-char (window-start))
-        (setq moved (vertical-motion (window-height)))
-        (set-window-start new-window (point))
-        (when (> (point) (window-point new-window))
-          (set-window-point new-window (point)))
-        (when (= moved (window-height))
-          (setq moved-by-window-height t)
-          (vertical-motion -1))
-        (setq bottom (point)))
-      (and moved-by-window-height
-           (<= bottom (point))
-           (set-window-point old-window (1- bottom)))
-      (and moved-by-window-height
-           (<= (window-start new-window) old-point)
-           (set-window-point new-window old-point)
-           (select-window new-window)))
+        ;; Use `save-excursion' around vertical movements below
+        ;; (Bug#10971).  Note: When the selected window's buffer has a
+        ;; header line, up to two lines of the buffer may not show up
+        ;; in the resulting configuration.
+        (save-excursion
+          (goto-char (window-start))
+          (setq moved (vertical-motion (window-height)))
+          (set-window-start new-window (point))
+          (when (> (point) (window-point new-window))
+            (set-window-point new-window (point)))
+          (when (= moved (window-height))
+            (setq moved-by-window-height t)
+            (vertical-motion -1))
+          (setq bottom (point)))
+        (and moved-by-window-height
+             (<= bottom (point))
+             (set-window-point-1 old-window (1- bottom)))
+        (and moved-by-window-height
+             (<= (window-start new-window) old-point)
+             (set-window-point new-window old-point)
+             (select-window new-window))))
     ;; Always copy quit-restore parameter in interactive use.
     (let ((quit-restore (window-parameter old-window 'quit-restore)))
       (when quit-restore