Merge from trunk.

6 files changed, 73 insertions, 51 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 35337de3fa4..729013ba54c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,23 @@
+2011-07-08  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * mail/sendmail.el (send-mail-function): No longer delay custom
+        initialization.
+        * custom.el (custom-initialize-delay): Doc fix.
+
+2011-07-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * abbrev.el (expand-abbrev): Try to preserve point (bug#5805).
+
+2011-07-08  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-sh-handle-start-file-process): Use a
+        human-friendly prompt.
+
+2011-07-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc/vc-bzr.el (vc-bzr-revision-keywords): Remove svn, it's only
+        provided by a particular plugin.
+
 2011-07-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * mail/sendmail.el (sendmail-query-once): If we aren't allowed to
@@ -41,7 +61,7 @@
         * info.el (Info-mode-map): Remove S-TAB binding, since [backtab]
         should cover it (bug#1281).
 
-        * cus-edit.el (custom-show): Marked as obsolete.
+        * cus-edit.el (custom-show): Mark as obsolete.
 
         * net/network-stream.el (network-stream-open-starttls): If gnutls
         negotiation fails, then possibly try again with a non-encrypted
@@ -62,18 +82,17 @@
 
         * international/characters.el (build-unicode-category-table):
         Delete it.
-        (unicode-category-table): Set it by
-        unicode-prroperty-table-internal.
+        (unicode-category-table): Set it by unicode-property-table-internal.
 
-        * international/mule-cmds.el (char-code-property-alist): Moved to
+        * international/mule-cmds.el (char-code-property-alist): Move to
         to src/chartab.c.
         (get-char-code-property): Call unicode-property-table-internal to
         load a file.  Call get-unicode-property-internal where necessary.
         (put-char-code-property): Call unicode-property-table-internal to
         load a file.  Call put-unicode-property-internal where necessary.
         put-unicode-property-internal where necessary.
-        (char-code-property-description): Call
-        unicode-property-table-internal to load a file.
+        (char-code-property-description):
+        Call unicode-property-table-internal to load a file.
 
         * international/charprop.el:
         * international/uni-bidi.el:
@@ -142,8 +161,8 @@
 2011-07-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * emacs-lisp/lisp-mode.el (eval-defun-1): Update the documentation
-        of faces when `M-C-x'-ing their definitions (bug#8378).  Also
-        clean up the code slightly.
+        of faces when `M-C-x'-ing their definitions (bug#8378).
+        Also clean up the code slightly.
 
         * progmodes/grep.el (rgrep): Don't bind `process-connection-type',
         because that makes the colours go away.
@@ -167,39 +186,38 @@
 2011-07-06  Michael R. Mauger  <mmaug@yahoo.com>
 
         * progmodes/sql.el: Version 3.0
-        (sql-product-alist): Added product :completion-object,
+        (sql-product-alist): Add product :completion-object,
         :completion-column, and :statement attributes.
-        (sql-mode-menu, sql-interactive-mode-map): Fixed List entries.
+        (sql-mode-menu, sql-interactive-mode-map): Fix List entries.
         (sql-mode-syntax-table): Mark all punctuation.
-        (sql-font-lock-keywords-builder): Temporarily removed fallback on
+        (sql-font-lock-keywords-builder): Temporarily remove fallback on
         ansi keywords.
         (sql-regexp-abbrev, sql-regexp-abbrev-list): New functions.
-        (sql-mode-oracle-font-lock-keywords): Improved.
+        (sql-mode-oracle-font-lock-keywords): Improve.
         (sql-oracle-show-reserved-words): New function for development.
         (sql-product-font-lock): Simplify for source code buffers.
         (sql-product-syntax-table, sql-product-font-lock-syntax-alist):
         New functions.
         (sql-highlight-product): Set product specific syntax table.
-        (sql-mode-map): Added statement movement functions.
-        (sql-ansi-statement-starters, sql-oracle-statement-starters): New
-        variable.
+        (sql-mode-map): Add statement movement functions.
+        (sql-ansi-statement-starters, sql-oracle-statement-starters):
+        New variable.
         (sql-statement-regexp, sql-beginning-of-statement)
         (sql-end-of-statement, sql-signum): New functions.
-        (sql-buffer-live-p, sql=find-sqli-buffer): Added CONNECTION
-        parameter.
+        (sql-buffer-live-p, sql=find-sqli-buffer): Add CONNECTION parameter.
         (sql-show-sqli-buffer): Bug fix.
         (sql-interactive-mode): Store connection data as buffer local.
-        (sql-connect): Added NEW-NAME parameter.  Redesigned interaction
+        (sql-connect): Add NEW-NAME parameter.  Redesign interaction
         with sql-interactive-mode.
         (sql-save-connection): Save buffer local settings.
-        (sql-connection-menu-filter): Changed menu entry name.
+        (sql-connection-menu-filter): Change menu entry name.
         (sql-product-interactive): Bug fix.
         (sql-preoutput-hold): New variable.
         (sql-interactive-remove-continuation-prompt): Bug fixes.
         (sql-debug-redirect): New variable.
         (sql-str-literal): New function.
         (sql-redirect, sql-redirect-one, sql-redirect-value, sql-execute):
-        Redesigned.
+        Redesign.
         (sql-oracle-save-settings, sql-oracle-restore-settings)
         (sql-oracle-list-all, sql-oracle-list-table): New functions.
         (sql-completion-object, sql-completion-column)
@@ -372,9 +390,8 @@
         buffer-saved-size and some allout state to not inhibit auto-saves
         if there are no longer any plain-text topics pending encryption.
 
-        (allout-next-topic-pending-encryption),
-        (allout-encrypt-decrypted): No longer provide for exemption of the
-        current topic.
+        (allout-next-topic-pending-encryption, allout-encrypt-decrypted):
+        No longer provide for exemption of the current topic.
 
 2011-07-04  Juri Linkov  <juri@jurta.org>
 
diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 2122f43bbad..3795dd46010 100644
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -814,19 +814,28 @@ Returns the abbrev symbol, if expansion took place."
     (destructuring-bind (&optional sym name wordstart wordend)
         (abbrev--before-point)
       (when sym
-        (unless (or ;; executing-kbd-macro
-                 noninteractive
-                 (window-minibuffer-p (selected-window)))
-          ;; Add an undo boundary, in case we are doing this for
-          ;; a self-inserting command which has avoided making one so far.
-          (undo-boundary))
-        ;; Now sym is the abbrev symbol.
-        (setq last-abbrev-text name)
-        (setq last-abbrev sym)
-        (setq last-abbrev-location wordstart)
-        ;; If this abbrev has an expansion, delete the abbrev
-        ;; and insert the expansion.
-        (abbrev-insert sym name wordstart wordend)))))
+        (let ((startpos (copy-marker (point) t))
+              (endmark (copy-marker wordend t)))
+          (unless (or ;; executing-kbd-macro
+                   noninteractive
+                   (window-minibuffer-p (selected-window)))
+            ;; Add an undo boundary, in case we are doing this for
+            ;; a self-inserting command which has avoided making one so far.
+            (undo-boundary))
+          ;; Now sym is the abbrev symbol.
+          (setq last-abbrev-text name)
+          (setq last-abbrev sym)
+          (setq last-abbrev-location wordstart)
+          ;; If this abbrev has an expansion, delete the abbrev
+          ;; and insert the expansion.
+          (prog1
+              (abbrev-insert sym name wordstart wordend)
+            ;; Yuck!!  If expand-abbrev is called with point slightly
+            ;; further than the end of the abbrev, move point back to
+            ;; where it started.
+            (if (and (> startpos endmark)
+                     (= (point) endmark)) ;Obey skeletons that move point.
+                (goto-char startpos))))))))
 
 (defun unexpand-abbrev ()
   "Undo the expansion of the last abbrev that expanded.
diff --git a/lisp/custom.el b/lisp/custom.el
index a5c0065036a..4f69c741468 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -120,8 +120,10 @@ the :set function.
 For variables in preloaded files, you can simply use this
 function for the :initialize property.  For autoloaded variables,
 you will also need to add an autoload stanza calling this
-function, and another one setting the standard-value property.
-See `send-mail-function' in sendmail.el for an example."
+function, and another one setting the standard-value property."
+  ;; No longer true:
+  ;; "See `send-mail-function' in sendmail.el for an example."
+
   ;; Until the var is actually initialized, it is kept unbound.
   ;; This seemed to be at least as good as setting it to an arbitrary
   ;; value like nil (evaluating `value' is not an option because it
diff --git a/lisp/mail/sendmail.el b/lisp/mail/sendmail.el
index b14c7e50137..5ffc834f533 100644
--- a/lisp/mail/sendmail.el
+++ b/lisp/mail/sendmail.el
@@ -138,14 +138,6 @@ Otherwise, let mailer send back a message to report errors."
   :group 'sendmail
   :version "23.1")
 
-;; Prevent problems with `window-system' not having the correct value
-;; when loaddefs.el is loaded. `custom-reevaluate-setting' needs the
-;; standard value.
-;;;###autoload
-(put 'send-mail-function 'standard-value
-     ;; MS-Windows can access the clipboard even under -nw.
-     '('sendmail-query-once))
-
 ;; Useful to set in site-init.el
 ;;;###autoload
 (defcustom send-mail-function 'sendmail-query-once
@@ -161,7 +153,6 @@ This is used by the default mail-sending commands.  See also
                 (function-item feedmail-send-it :tag "Use Feedmail package")
                 (function-item mailclient-send-it :tag "Use Mailclient package")
                 function)
-  :initialize 'custom-initialize-delay
   :version "24.1"
   :group 'sendmail)
 
@@ -212,8 +203,6 @@ function to use, and then save that choice."
         (setq sendmail-query-once-function function))))
   (funcall sendmail-query-once-function))
 
-;;;###autoload(custom-initialize-delay 'send-mail-function nil)
-
 ;;;###autoload
 (defcustom mail-header-separator (purecopy "--text follows this line--")
   "Line used to separate headers from text in messages being composed."
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index f342b005c4c..1c6f0844be0 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -2690,8 +2690,13 @@ the result will be a local, non-Tramp, filename."
     ;; When PROGRAM is nil, we just provide a tty.
     (let ((command
            (when (stringp program)
-             (format "cd %s; exec %s"
+             (format "cd %s; exec env PS1=%s %s"
                      (tramp-shell-quote-argument localname)
+                     ;; Use a human-friendly prompt, for example for `shell'.
+                     (tramp-shell-quote-argument
+                      (format "%s %s"
+                              (file-remote-p default-directory)
+                              tramp-initial-end-of-output))
                      (mapconcat 'tramp-shell-quote-argument
                                 (cons program args) " "))))
           (tramp-process-connection-type
diff --git a/lisp/vc/vc-bzr.el b/lisp/vc/vc-bzr.el
index 0fdb2230af8..4eff3244cdc 100644
--- a/lisp/vc/vc-bzr.el
+++ b/lisp/vc/vc-bzr.el
@@ -1174,7 +1174,7 @@ stream.  Standard error output is discarded."
   (defconst vc-bzr-revision-keywords
     ;; bzr help revisionspec  | sed -ne 's/^\([a-z]*\):$/"\1"/p' | sort -u
     '("ancestor" "annotate" "before" "branch" "date" "last" "mainline" "revid"
-      "revno" "submit" "svn" "tag")))
+      "revno" "submit" "tag")))
 
 (defun vc-bzr-revision-completion-table (files)
   (lexical-let ((files files))