merge changes in emacs-23 branch

7 files changed, 338 insertions, 30 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7ea8d3aa116..cd86f9d20e4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -8,6 +8,17 @@
         Fix overenthusiastic optimisation.
         (pcase-u1): Handle the case of a lambda pred.
 
+2010-08-31  Kenichi Handa  <handa@m17n.org>
+
+        * international/mule-cmds.el (standard-display-european-internal):
+        Setup standard-display-table for 8-bit characters by storing 8-bit
+        characters in the element vector.
+
+        * disp-table.el (standard-display-8bit): Setup
+        standard-display-table for 8-bit characters by storing 8-bit
+        characters in the element vector.
+        (standard-display-european): Likewise.
+
 2010-08-31  Masatake YAMATO  <yamato@redhat.com>
 
         * textmodes/nroff-mode.el (nroff-view): New command.
@@ -167,6 +178,57 @@
 
         * whitespace.el (whitespace-style): Adjust type declaration.
 
+2010-08-26  Magnus Henoch  <magnus.henoch@gmail.com>
+
+        * net/tramp-gvfs.el (tramp-gvfs-handle-copy-file): Do not pass
+        empty argument to gvfs-copy.
+
+2010-08-26  Chong Yidong  <cyd@stupidchicken.com>
+
+        * net/tramp-compat.el (tramp-compat-delete-file): Rewrite to
+        handle new TRASH arg of `delete-file'.
+
+2010-08-26  Christian Lynbech  <christian.lynbech@tieto.com>  (tiny change)
+
+        * net/tramp.el (tramp-handle-insert-directory): Don't use
+        `forward-word', its default syntax could be changed.
+
+2010-08-26  Toru TSUNEYOSHI  <t_tuneyosi@hotmail.com>
+            Michael Albinus  <michael.albinus@gmx.de>
+
+        Implement compression for inline methods.
+
+        * net/tramp.el (tramp-inline-compress-start-size): New defcustom.
+        (tramp-copy-size-limit): Allow also nil.
+        (tramp-inline-compress-commands): New defconst.
+        (tramp-find-inline-compress, tramp-get-inline-compress)
+        (tramp-get-inline-coding): New defuns.
+        (tramp-get-remote-coding, tramp-get-local-coding): Remove,
+        replaced by `tramp-get-inline-coding'.
+        (tramp-handle-file-local-copy, tramp-handle-write-region)
+        (tramp-method-out-of-band-p): Use `tramp-get-inline-coding'.
+
+2010-08-26  Noah Lavine  <noah549@gmail.com>  (tiny change)
+
+        Detect ssh 'ControlMaster' argument automatically in some cases.
+
+        * net/tramp.el (tramp-detect-ssh-controlmaster): New defun.
+        (tramp-default-method): Use it.
+
+2010-08-26  Karel Klíč  <kklic@redhat.com>
+
+        * net/tramp.el (tramp-file-name-for-operation):
+        Add file-selinux-context.
+
+2010-08-26  Łukasz Stelmach  <lukasz.stelmach@iem.pw.edu.pl>  (tiny change)
+
+        * play/cookie1.el (read-cookie): Fix off-by-one error (bug#6921).
+
+2010-08-26  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (beginning-of-buffer, end-of-buffer): Doc fix
+        (Bug#6907).
+
 2010-08-26  Nathan Weizenbaum  <nweiz@cressida.sea.corp.google.com>  (tiny change)
 
         * progmodes/js.el: Make indentation more customizable (Bug#6914).
@@ -190,6 +252,211 @@
 
         Sync with Tramp 2.1.19.
 
+        * net/tramp-cmds.el (tramp-cleanup-all-connections)
+        (tramp-reporter-dump-variable, tramp-load-report-modules)
+        (tramp-append-tramp-buffers): Use `tramp-compat-funcall'.
+        (tramp-bug): Recommend setting of `tramp-verbose' to 9.
+
+        * net/tramp-compat.el (top): Do not autoload
+        `tramp-handle-file-remote-p'.  Load tramp-util.el and tramp-vc.el
+        only when `start-file-process' is not bound.
+        (byte-compile-not-obsolete-vars): Define if not bound.
+        (tramp-compat-funcall): New defmacro.
+        (tramp-compat-line-beginning-position)
+        (tramp-compat-line-end-position)
+        (tramp-compat-temporary-file-directory)
+        (tramp-compat-make-temp-file, tramp-compat-file-attributes)
+        (tramp-compat-copy-file, tramp-compat-copy-directory)
+        (tramp-compat-delete-file, tramp-compat-delete-directory)
+        (tramp-compat-number-sequence, tramp-compat-process-running-p):
+        Use it.
+        (tramp-advice-file-expand-wildcards): Do not use
+        `tramp-handle-file-remote-p'.
+        (tramp-compat-make-temp-file): Simplify fallback implementation.
+        (tramp-compat-copy-file): Add PRESERVE-SELINUX-CONTEXT.
+        (tramp-compat-copy-tree): Remove function.
+        (tramp-compat-delete-file): New defun.
+        (tramp-compat-delete-directory): Provide implementation for older
+        Emacsen.
+        (tramp-compat-file-attributes): Handle only
+        `wrong-number-of-arguments' error.
+
+        * net/tramp-fish.el (tramp-fish-handle-copy-file): Add
+        PRESERVE_SELINUX_CONTEXT.
+        (tramp-fish-handle-delete-file): Add TRASH arg.
+        (tramp-fish-handle-directory-files-and-attributes):
+        Do not use `tramp-fish-handle-file-attributes.
+        (tramp-fish-handle-file-local-copy)
+        (tramp-fish-handle-insert-file-contents)
+        (tramp-fish-maybe-open-connection): Use `with-progress-reporter'.
+
+        * net/tramp-gvfs.el (top): Require url-util.
+        (tramp-gvfs-mount-point): Remove.
+        (tramp-gvfs-file-name-handler-alist): Add `file-selinux-context'
+        and `set-file-selinux-context'.
+        (tramp-gvfs-stringify-dbus-message, tramp-gvfs-send-command)
+        (tramp-gvfs-handle-file-selinux-context)
+        (tramp-gvfs-handle-set-file-selinux-context): New defuns.
+        (with-tramp-dbus-call-method): Format trace message.
+        (tramp-gvfs-handle-copy-file): Handle PRESERVE-SELINUX-CONTEXT.
+        (tramp-gvfs-handle-copy-file, tramp-gvfs-handle-rename-file):
+        Implement backup call, when operation on local files fails.  Use
+        progress reporter.  Flush properties of changed files.
+        (tramp-gvfs-handle-delete-file): Add TRASH arg.  Use
+        `tramp-compat-delete-file'.
+        (tramp-gvfs-handle-expand-file-name): Expand "~/".
+        (tramp-gvfs-handle-make-directory): Make more traces.
+        (tramp-gvfs-handle-write-region): Protect deleting tmpfile.
+        (tramp-gvfs-url-file-name): Hexify file name in url.
+        (tramp-gvfs-fuse-file-name): Take also prefix (like dav shares)
+        into account for the resulting file name.
+        (tramp-gvfs-handler-askquestion): Preserve current message, in
+        order to let progress reporter continue afterwards.  (Bug#6257)
+        Return dummy mountpoint, when the answer is "no".  See
+        `tramp-gvfs-maybe-open-connection'.
+        (tramp-gvfs-handler-mounted-unmounted)
+        (tramp-gvfs-connection-mounted-p): Test also for new mountspec
+        attribute "default_location".  Set "prefix" property.  Handle
+        default-location.
+        (tramp-gvfs-mount-spec): Return both prefix and mountspec.
+        (tramp-gvfs-maybe-open-connection): Test, whether mountpoint
+        exists.  Raise an error, if not (due to a corresponding answer
+        "no" in interactive questions, for example). Use
+        `tramp-compat-funcall'.
+
+        * net/tramp-imap.el (top): Autoload `epg-make-context'.
+        (tramp-imap-handle-copy-file): Add PRESERVE-SELINUX-CONTEXT.
+        (tramp-imap-do-copy-or-rename-file)
+        (tramp-imap-handle-insert-file-contents)
+        (tramp-imap-handle-file-local-copy): Use `with-progress-reporter'.
+        (tramp-imap-handle-delete-file): Add TRASH arg.
+
+        * net/tramp-smb.el (tramp-smb-handle-copy-file): Add
+        PRESERVE-SELINUX-CONTEXT.
+        (tramp-smb-handle-copy-file)
+        (tramp-smb-handle-file-local-copy, tramp-smb-handle-rename-file)
+        (tramp-smb-handle-write-region, tramp-smb-maybe-open-connection):
+        Use `with-progress-reporter'.
+        (tramp-smb-handle-delete-file): Add TRASH arg.
+
+        * net/tramp.el (tramp-methods): Move hostname to the end in all
+        ssh `tramp-login-args'.  Add `tramp-async-args' attribute where
+        appropriate.
+        (tramp-verbose): Describe verbose level 9.
+        (tramp-completion-function-alist)
+        (tramp-file-name-regexp, tramp-chunksize)
+        (tramp-local-coding-commands, tramp-remote-coding-commands)
+        (with-connection-property, tramp-completion-mode-p)
+        (tramp-action-process-alive, tramp-action-out-of-band)
+        (tramp-check-for-regexp, tramp-file-name-p, tramp-equal-remote)
+        (tramp-exists-file-name-handler): Fix docstring.
+        (tramp-remote-process-environment): Use `format' instead of
+        `concat'.  Protect version string by apostroph.
+        (tramp-shell-prompt-pattern): Do not use a shy group in case of
+        XEmacs.
+        (tramp-file-name-regexp-unified)
+        (tramp-completion-file-name-regexp-unified): On W32 systems, do
+        not regard the volume letter as remote filename.  (Bug#5447)
+        (tramp-perl-file-attributes)
+        (tramp-perl-directory-files-and-attributes): Don't pass "$3".
+        (tramp-vc-registered-read-file-names): Read input as
+        here-document, otherwise the command could exceed maximum length
+        of command line.
+        (tramp-file-name-handler-alist): Add `file-selinux-context' and
+        `set-file-selinux-context'.
+        (tramp-debug-message): Add `tramp-compat-funcall' to ignored
+        backtrace functions.
+        (tramp-error-with-buffer): Don't show the connection buffer when
+        we are in completion mode.
+        (tramp-progress-reporter-update, tramp-remote-selinux-p)
+        (tramp-handle-file-selinux-context)
+        (tramp-handle-set-file-selinux-context, tramp-process-sentinel)
+        (tramp-connectable-p, tramp-open-shell, tramp-get-remote-trash):
+        New defuns.
+        (with-progress-reporter): New defmacro.
+        (tramp-debug-outline-regexp): New defconst.
+        (top, tramp-rfn-eshadow-setup-minibuffer)
+        (tramp-rfn-eshadow-update-overlay, tramp-handle-set-file-times)
+        (tramp-handle-dired-compress-file, tramp-handle-shell-command)
+        (tramp-completion-mode-p, tramp-check-for-regexp)
+        (tramp-open-connection-setup-interactive-shell)
+        (tramp-compute-multi-hops, tramp-read-passwd, tramp-clear-passwd)
+        (tramp-time-diff, tramp-coding-system-change-eol-conversion)
+        (tramp-set-process-query-on-exit-flag, tramp-unload-tramp):
+        Use `tramp-compat-funcall'.
+        (tramp-handle-make-symbolic-link): Flush file properties.
+        (tramp-handle-load, tramp-handle-file-local-copy)
+        (tramp-handle-insert-file-contents, tramp-handle-write-region)
+        (tramp-handle-vc-registered, tramp-maybe-send-script)
+        (tramp-find-shell): Use `with-progress-reporter'.
+        (tramp-do-file-attributes-with-stat): Add space in format string,
+        in order to work around a bug in pdksh.  Reported by Gilles Pion
+        <gpion@lfdj.com>.
+        (tramp-handle-verify-visited-file-modtime): Do not send a command
+        when the connection is not established.
+        (tramp-handle-set-file-times): Simplify the check for utc.
+        (tramp-handle-directory-files-and-attributes)
+        (tramp-get-remote-path): Use `copy-tree'.
+        (tramp-completion-handle-file-name-all-completions): Ensure, that
+        non remote files are still checked.  Oops.
+        (tramp-handle-copy-file, tramp-do-copy-or-rename-file): Handle
+        PRESERVE-SELINUX-CONTEXT.
+        (tramp-do-copy-or-rename-file): Add progress reporter.
+        (tramp-do-copy-or-rename-file-directly): Do not use
+        `tramp-handle-file-remote-p'.
+        (tramp-do-copy-or-rename-file-out-of-band):
+        Use `tramp-compat-delete-directory'.
+        (tramp-do-copy-or-rename-file-out-of-band)
+        (tramp-compute-multi-hops, tramp-maybe-open-connection):
+        Use `format-spec-make'.
+        (tramp-handle-delete-file): Add TRASH arg.
+        (tramp-handle-dired-uncache): Flush directory cache, not only file
+        cache.
+        (tramp-handle-expand-file-name)
+        (tramp-completion-handle-file-name-all-completions)
+        (tramp-completion-handle-file-name-completion): Use
+        `tramp-connectable-p'.
+        (tramp-handle-start-file-process): Set connection property "vec".
+        Use it, in order to invalidate file caches.  Check only for
+        `remote-tty' process property.
+        Implement tty setting.  (Bug#4604, Bug#6360)
+        (tramp-file-name-for-operation): Add `call-process-region' and
+        `set-file-selinux-context'.
+        (tramp-find-foreign-file-name-handler)
+        (tramp-advice-make-auto-save-file-name)
+        (tramp-set-auto-save-file-modes): Remove superfluous check for
+        `stringp'.  This is done inside `tramp-tramp-file-p'.
+        (tramp-file-name-handler): Trace 'quit.  Catch the error for some
+        operations when we are in completion mode.  This gives the user
+        the chance to correct the file name in the minibuffer.
+        (tramp-completion-mode-p): Use `non-essential'.
+        (tramp-handle-file-name-all-completions): Backward/ XEmacs
+        compatibility: Use `completion-ignore-case' if
+        `read-file-name-completion-ignore-case' does not exist.
+        (tramp-get-debug-buffer): Use `tramp-debug-outline-regexp'.
+        (tramp-find-shell, tramp-open-connection-setup-interactive-shell):
+        `tramp-open-shell'.
+        (tramp-action-password): Hide password prompt before next run.
+        (tramp-process-actions): Widen connection buffer for the trace.
+        (tramp-open-connection-setup-interactive-shell): Set `remote-tty'
+        process property.  Trace stty settings if `tramp-verbose' >= 9.
+        Apply workaround for IRIX64 bug.  Move argument of last
+        `tramp-send-command' where it belongs to.
+        (tramp-maybe-open-connection): Use `async-args' and `gw-args' in
+        front of `login-args'.
+        (tramp-get-ls-command, tramp-get-ls-command-with-dired): Run tests
+        on "/dev/null" instead of "/".
+        (tramp-get-ls-command-with-dired): Make test for "--dired"
+        stronger.
+        (tramp-set-auto-save-file-modes): Adapt version check.
+        (tramp-set-process-query-on-exit-flag): Fix wrong parentheses.
+        (tramp-handle-process-file): Call the program in a subshell, in
+        order to preserve working directory.
+        (tramp-handle-shell-command): Don't use hard-wired "/bin/sh" but
+        `tramp-remote-sh' from `tramp-methods'.
+        (tramp-get-ls-command): Make test for "--color=never" stronger.
+        (tramp-check-for-regexp): Use (forward-line 1).
+
         * net/trampver.el: Update release number.
 
 2010-08-26  Chong Yidong  <cyd@stupidchicken.com>
@@ -275,6 +542,11 @@
         * mouse.el (mouse-yank-primary): Avoid setting primary when
         deactivating the mark (Bug#6872).
 
+2010-08-23  Chris Foote <chris@foote.com.au>  (tiny change)
+
+        * progmodes/python.el (python-block-pairs): Allow use of "finally"
+        with "else" (Bug#3991).
+
 2010-08-23  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/dbus.el: Accept UNIX domain sockets as bus address.
@@ -301,13 +573,19 @@
         * startup.el (command-line-1): Issue warning for ignored arguments
         --unibyte, etc (Bug#6886).
 
+2010-08-22  Leo  <sdl.web@gmail.com>
+
+        * net/rcirc.el (rcirc-add-or-remove): Accept a list of elements.
+        (ignore, bright, dim, keyword): Split list of nicknames before
+        passing to rcirc-add-or-remove (Bug#6894).
+
 2010-08-22  Chong Yidong  <cyd@stupidchicken.com>
 
         * emacs-lisp/easy-mmode.el (define-minor-mode): Doc fix (Bug#6880).
 
 2010-08-22  Leo  <sdl.web@gmail.com>
 
-        Fix buffer-list rename&refresh after after killing a buffer in ido.
+        Fix buffer-list rename&refresh after killing a buffer in ido.
         * lisp/ido.el: Revert Óscar's.
         (ido-kill-buffer-at-head): Exit the minibuffer with ido-exit=refresh.
         Remember the buffers at head, rather than their name.
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index e0d2d790f6c..e9bdd3d9be3 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -110,11 +110,27 @@ Valid symbols are `truncation', `wrap', `escape', `control',
 
 ;;;###autoload
 (defun standard-display-8bit (l h)
-  "Display characters in the range L to H literally."
+  "Display characters representing raw bytes in the range L to H literally.
+
+On a terminal display, each character in the range is displayed
+by sending the corresponding byte directly to the terminal.
+
+On a graphic display, each character in the range is displayed
+using the default font by a glyph whose code is the corresponding
+byte.
+
+Note that ASCII printable characters (SPC to TILDA) are displayed
+in the default way after this call."
   (or standard-display-table
       (setq standard-display-table (make-display-table)))
+  (if (> h 255)
+      (setq h 255))
   (while (<= l h)
-    (aset standard-display-table l (if (or (< l ?\s) (>= l 127)) (vector l)))
+    (if (< l 128)
+        (aset standard-display-table l
+              (if (or (< l ?\s) (= l 127)) (vector l)))
+      (let ((c (unibyte-char-to-multibyte l)))
+        (aset standard-display-table c (vector c))))
     (setq l (1+ l))))
 
 ;;;###autoload
@@ -236,9 +252,12 @@ in `.emacs'."
           (and (null arg)
                (char-table-p standard-display-table)
                ;; Test 161, because 160 displays as a space.
-               (equal (aref standard-display-table 161) [161])))
+               (equal (aref standard-display-table
+                            (unibyte-char-to-multibyte 161))
+                      (vector (unibyte-char-to-multibyte 161)))))
       (progn
-        (standard-display-default 160 255)
+        (standard-display-default
+         (unibyte-char-to-multibyte 160) (unibyte-char-to-multibyte 255))
         (unless (or (memq window-system '(x w32 ns)))
           (and (terminal-coding-system)
                (set-terminal-coding-system nil))))
diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 91b4e42807d..a3609c0ccfc 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1952,7 +1952,7 @@ See `set-language-info-alist' for use in programs."
                      (> (aref (number-to-string (nth 2 (x-server-version))) 0)
                         ?3))
           ;; Make non-line-break space display as a plain space.
-          (aset standard-display-table 160 [32]))
+          (aset standard-display-table (unibyte-char-to-multibyte 160) [32]))
         ;; Most Windows programs send out apostrophes as \222.  Most X fonts
         ;; don't contain a character at that position.  Map it to the ASCII
         ;; apostrophe.  [This is actually RIGHT SINGLE QUOTATION MARK,
@@ -1960,7 +1960,7 @@ See `set-language-info-alist' for use in programs."
         ;; fonts probably have the appropriate glyph at this position,
         ;; so they could use standard-display-8bit.  It's better to use a
         ;; proper windows-1252 coding system.  --fx]
-        (aset standard-display-table 146 [39]))))
+        (aset standard-display-table (unibyte-char-to-multibyte 146) [39]))))
 
 (defun set-language-environment-coding-systems (language-name)
   "Do various coding system setups for language environment LANGUAGE-NAME."
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index b4a7b3118d2..9af6057c20c 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -1085,7 +1085,7 @@ Create the buffer if it doesn't exist."
     (goto-char (point-max))
     (when (not (equal 0 (- (point) rcirc-prompt-end-marker)))
       ;; delete a trailing newline
-      (when (bolp)
+      (when (eq (point) (point-at-bol))
         (delete-char -1))
       (let ((input (buffer-substring-no-properties
                     rcirc-prompt-end-marker (point))))
@@ -2151,12 +2151,13 @@ With a prefix arg, prompt for new topic."
   (rcirc-send-string process (format "PRIVMSG %s :\C-aACTION %s\C-a"
                                      target args)))
 
-(defun rcirc-add-or-remove (set &optional elt)
-  (if (and elt (not (string= "" elt)))
-      (if (member-ignore-case elt set)
-          (delete elt set)
-        (cons elt set))
-    set))
+(defun rcirc-add-or-remove (set &rest elements)
+  (dolist (elt elements)
+    (if (and elt (not (string= "" elt)))
+        (setq set (if (member-ignore-case elt set)
+                      (delete elt set)
+                    (cons elt set)))))
+  set)
 
 (defun-rcirc-command ignore (nick)
   "Manage the ignore list.
@@ -2164,7 +2165,9 @@ Ignore NICK, unignore NICK if already ignored, or list ignored
 nicks when no NICK is given.  When listing ignored nicks, the
 ones added to the list automatically are marked with an asterisk."
   (interactive "sToggle ignoring of nick: ")
-  (setq rcirc-ignore-list (rcirc-add-or-remove rcirc-ignore-list nick))
+  (setq rcirc-ignore-list
+        (apply #'rcirc-add-or-remove rcirc-ignore-list
+               (split-string nick nil t)))
   (rcirc-print process nil "IGNORE" target
                (mapconcat
                 (lambda (nick)
@@ -2176,14 +2179,18 @@ ones added to the list automatically are marked with an asterisk."
 (defun-rcirc-command bright (nick)
   "Manage the bright nick list."
   (interactive "sToggle emphasis of nick: ")
-  (setq rcirc-bright-nicks (rcirc-add-or-remove rcirc-bright-nicks nick))
+  (setq rcirc-bright-nicks
+        (apply #'rcirc-add-or-remove rcirc-bright-nicks
+               (split-string nick nil t)))
   (rcirc-print process nil "BRIGHT" target
                (mapconcat 'identity rcirc-bright-nicks " ")))
 
 (defun-rcirc-command dim (nick)
   "Manage the dim nick list."
   (interactive "sToggle deemphasis of nick: ")
-  (setq rcirc-dim-nicks (rcirc-add-or-remove rcirc-dim-nicks nick))
+  (setq rcirc-dim-nicks
+        (apply #'rcirc-add-or-remove rcirc-dim-nicks
+               (split-string nick nil t)))
   (rcirc-print process nil "DIM" target
                (mapconcat 'identity rcirc-dim-nicks " ")))
 
@@ -2192,7 +2199,9 @@ ones added to the list automatically are marked with an asterisk."
 Mark KEYWORD, unmark KEYWORD if already marked, or list marked
 keywords when no KEYWORD is given."
   (interactive "sToggle highlighting of keyword: ")
-  (setq rcirc-keywords (rcirc-add-or-remove rcirc-keywords keyword))
+  (setq rcirc-keywords
+        (apply #'rcirc-add-or-remove rcirc-keywords
+               (split-string keyword nil t)))
   (rcirc-print process nil "KEYWORD" target
                (mapconcat 'identity rcirc-keywords " ")))
 
diff --git a/lisp/play/cookie1.el b/lisp/play/cookie1.el
index 75c0d9b2b06..e786c6cc5c1 100644
--- a/lisp/play/cookie1.el
+++ b/lisp/play/cookie1.el
@@ -138,7 +138,7 @@ Optional fifth arg REQUIRE-MATCH non-nil forces a matching cookie."
                                 (vec (cookie-snarf phrase-file
                                                    startmsg endmsg))
                                 (i (length vec)))
-                           (while (> (setq i (1- i)) 0)
+                           (while (>= (setq i (1- i)) 0)
                              (setq alist (cons (list (aref vec i)) alist)))
                            (put sym 'completion-alist alist))))
                    nil require-match nil nil))
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el
index 2690d399411..2f65ffa1e17 100644
--- a/lisp/progmodes/python.el
+++ b/lisp/progmodes/python.el
@@ -782,7 +782,7 @@ Set `python-indent' locally to the value guessed."
   '(("else" "if" "elif" "while" "for" "try" "except")
     ("elif" "if" "elif")
     ("except" "try" "except")
-    ("finally" "try" "except"))
+    ("finally" "else" "try" "except"))
   "Alist of keyword matches.
 The car of an element is a keyword introducing a statement which
 can close a block opened by a keyword in the cdr.")
diff --git a/lisp/simple.el b/lisp/simple.el
index 610698cc09b..3cdac1e19f0 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -804,15 +804,16 @@ If BACKWARD-ONLY is non-nil, only delete them before point."
        (constrain-to-field nil orig-pos t)))))
 
 (defun beginning-of-buffer (&optional arg)
-  "Move point to the beginning of the buffer; leave mark at previous position.
-With \\[universal-argument] prefix, do not set mark at previous position.
+  "Move point to the beginning of the buffer.
 With numeric arg N, put point N/10 of the way from the beginning.
+If the buffer is narrowed, this command uses the beginning of the
+accessible part of the buffer.
 
-If the buffer is narrowed, this command uses the beginning and size
-of the accessible part of the buffer.
+If Transient Mark mode is disabled, leave mark at previous
+position, unless a \\[universal-argument] prefix is supplied.
 
 Don't use this command in Lisp programs!
-\(goto-char (point-min)) is faster and avoids clobbering the mark."
+\(goto-char (point-min)) is faster."
   (interactive "^P")
   (or (consp arg)
       (region-active-p)
@@ -829,15 +830,16 @@ Don't use this command in Lisp programs!
   (if (and arg (not (consp arg))) (forward-line 1)))
 
 (defun end-of-buffer (&optional arg)
-  "Move point to the end of the buffer; leave mark at previous position.
-With \\[universal-argument] prefix, do not set mark at previous position.
+  "Move point to the end of the buffer.
 With numeric arg N, put point N/10 of the way from the end.
+If the buffer is narrowed, this command uses the end of the
+accessible part of the buffer.
 
-If the buffer is narrowed, this command uses the beginning and size
-of the accessible part of the buffer.
+If Transient Mark mode is disabled, leave mark at previous
+position, unless a \\[universal-argument] prefix is supplied.
 
 Don't use this command in Lisp programs!
-\(goto-char (point-max)) is faster and avoids clobbering the mark."
+\(goto-char (point-max)) is faster."
   (interactive "^P")
   (or (consp arg) (region-active-p) (push-mark))
   (let ((size (- (point-max) (point-min))))