merge emacs-23

9 files changed, 65 insertions, 26 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b8192344354..358c674639e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -3,6 +3,36 @@
         * face-remap.el (text-scale-adjust): Call read-event with a proper
         prompt.
 
+2010-10-19  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-do-file-attributes-with-stat)
+        (tramp-do-directory-files-and-attributes-with-stat): Use "e0" in
+        order to make stat results a float.  Patch by Andreas Schwab
+        <schwab@linux-m68k.org>.
+
+2010-10-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * repeat.el (repeat): Use read-key (bug#6256).
+
+2010-10-18  Chong Yidong  <cyd@stupidchicken.com>
+
+        * emacs-lisp/unsafep.el: Don't mark functions that display
+        messages as safe.  Suggested by Johan Bockgård.
+
+2010-10-17  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/regexp-opt.el (regexp-opt-group, regexp-opt-charset):
+        Turn comments into docstrings.
+
+        * minibuffer.el (completion--replace): Move point where it belongs
+        when there's a common suffix (bug#7215).
+
+2010-10-15  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-open-connection-setup-interactive-shell):
+        Suppress expansion of tabs to spaces.  Reported by Dale Sedivec
+        <dale@codefu.org>.
+
 2010-10-15  Kenichi Handa  <handa@m17n.org>
 
         * international/characters.el: Add category '|' (word breakable)
@@ -13,8 +43,7 @@
         * mail/rmail.el (rmail-show-message-1): Catch an error of
         base64-decode-region and just show an error message (bug#7165).
 
-        * ps-mule.el (ps-mule-font-spec-list): Delete it.  Not used
-        anymore.
+        * ps-mule.el (ps-mule-font-spec-list): Delete it.  Not used anymore.
         (ps-mule-begin-job): Fix for the case that only ENCODING is set in
         a font-spec (bug#7197).
 
diff --git a/lisp/emacs-lisp/regexp-opt.el b/lisp/emacs-lisp/regexp-opt.el
index 78eba19a253..f70ad4047a7 100644
--- a/lisp/emacs-lisp/regexp-opt.el
+++ b/lisp/emacs-lisp/regexp-opt.el
@@ -136,11 +136,10 @@ This means the number of non-shy regexp grouping constructs
   (require 'cl))
 
 (defun regexp-opt-group (strings &optional paren lax)
-  ;; Return a regexp to match a string in the sorted list STRINGS.
-  ;; If PAREN non-nil, output regexp parentheses around returned regexp.
-  ;; If LAX non-nil, don't output parentheses if it doesn't require them.
-  ;; Merges keywords to avoid backtracking in Emacs' regexp matcher.
-
+  "Return a regexp to match a string in the sorted list STRINGS.
+If PAREN non-nil, output regexp parentheses around returned regexp.
+If LAX non-nil, don't output parentheses if it doesn't require them.
+Merges keywords to avoid backtracking in Emacs' regexp matcher."
   ;; The basic idea is to find the shortest common prefix or suffix, remove it
   ;; and recurse.  If there is no prefix, we divide the list into two so that
   ;; \(at least) one half will have at least a one-character common prefix.
@@ -234,9 +233,7 @@ This means the number of non-shy regexp grouping constructs
 
 
 (defun regexp-opt-charset (chars)
-  ;;
-  ;; Return a regexp to match a character in CHARS.
-  ;;
+  "Return a regexp to match a character in CHARS."
   ;; The basic idea is to find character ranges.  Also we take care in the
   ;; position of character set meta characters in the character set regexp.
   ;;
diff --git a/lisp/emacs-lisp/unsafep.el b/lisp/emacs-lisp/unsafep.el
index 851a1f7652b..a62f8de4010 100644
--- a/lisp/emacs-lisp/unsafep.el
+++ b/lisp/emacs-lisp/unsafep.el
@@ -101,15 +101,13 @@ in the parse.")
 (dolist (x '(;;Special forms
              and catch if or prog1 prog2 progn while unwind-protect
              ;;Safe subrs that have some side-effects
-             ding error message minibuffer-message random read-minibuffer
-             signal sleep-for string-match throw y-or-n-p yes-or-no-p
+             ding error random signal sleep-for string-match throw
              ;;Defsubst functions from subr.el
              caar cadr cdar cddr
              ;;Macros from subr.el
-             save-match-data unless when with-temp-message
+             save-match-data unless when
              ;;Functions from subr.el that have side effects
-             read-passwd split-string replace-regexp-in-string
-             play-sound-file))
+             split-string replace-regexp-in-string play-sound-file))
   (put x 'safe-function t))
 
 ;;;###autoload
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index a4ab5261f7c..bc5a1d2e807 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -498,10 +498,11 @@ Moves point to the end of the new text."
       (setq suffix-len (1+ suffix-len)))
     (unless (zerop suffix-len)
       (setq end (- end suffix-len))
-      (setq newtext (substring newtext 0 (- suffix-len)))))
-  (goto-char beg)
-  (insert newtext)
-  (delete-region (point) (+ (point) (- end beg))))
+      (setq newtext (substring newtext 0 (- suffix-len))))
+    (goto-char beg)
+    (insert newtext)
+    (delete-region (point) (+ (point) (- end beg)))
+    (forward-char suffix-len)))
 
 (defun completion--do-completion (&optional try-completion-function)
   "Do the completion and return a summary of what happened.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index d5d1606c617..3ee5509276e 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -2922,7 +2922,7 @@ target of the symlink differ."
    (format
     ;; On Opsware, pdksh (which is the true name of ksh there) doesn't
     ;; parse correctly the sequence "((".  Therefore, we add a space.
-    "( (%s %s || %s -h %s) && %s -c '( (\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)' %s || echo nil)"
+    "( (%s %s || %s -h %s) && %s -c '( (\"%%N\") %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 \"%%A\" t %%ie0 -1)' %s || echo nil)"
     (tramp-get-file-exists-command vec)
     (tramp-shell-quote-argument localname)
     (tramp-get-test-command vec)
@@ -3378,7 +3378,7 @@ value of `default-file-modes', without execute permissions."
      ;; but it does not work on all remote systems.  Therefore, we
      ;; quote the filenames via sed.
      "cd %s; echo \"(\"; (%s -a | sed -e s/\\$/\\\"/g -e s/^/\\\"/g | xargs "
-     "%s -c '(\"%%n\" (\"%%N\") %%h %s %s %%X.0 %%Y.0 %%Z.0 %%s.0 \"%%A\" t %%i.0 -1)'); "
+     "%s -c '(\"%%n\" (\"%%N\") %%h %s %s %%Xe0 %%Ye0 %%Ze0 %%se0 \"%%A\" t %%ie0 -1)'); "
      "echo \")\"")
     (tramp-shell-quote-argument localname)
     (tramp-get-ls-command vec)
@@ -7013,9 +7013,7 @@ process to set up.  VEC specifies the connection."
         ;; because we're running on a non-MULE Emacs.  Let's try
         ;; stty, instead.
         (tramp-send-command vec "stty -onlcr" t))))
-  ;; Dump stty settings in the traces.
-  (when (>= tramp-verbose 9)
-    (tramp-send-command vec "stty -a" t))
+
   (tramp-send-command vec "set +o vi +o emacs" t)
 
   ;; Check whether the output of "uname -sr" has been changed.  If
@@ -7086,11 +7084,20 @@ process to set up.  VEC specifies the connection."
   (when (string-match "^IRIX64" (tramp-get-connection-property vec "uname" ""))
     (tramp-send-command vec "set +H" t))
 
+  ;; On BSD-like systems, ?\t is expanded to spaces.  Suppress this.
+  (when (string-match "BSD\\|Darwin"
+                      (tramp-get-connection-property vec "uname" ""))
+    (tramp-send-command vec "stty -oxtabs" t))
+
   ;; Set `remote-tty' process property.
   (ignore-errors
     (let ((tty (tramp-send-command-and-read vec "echo \\\"`tty`\\\"")))
       (unless (zerop (length tty)) (process-put proc 'remote-tty tty))))
 
+  ;; Dump stty settings in the traces.
+  (when (>= tramp-verbose 9)
+    (tramp-send-command vec "stty -a" t))
+
   ;; Set the environment.
   (tramp-message vec 5 "Setting default environment")
 
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 0efac03f7d5..69b32e5d52d 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -6656,7 +6656,7 @@ If FACE is not a valid face name, use default face."
 ;; But autoload them here to make the separation invisible.
 
 ;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize
-;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "9187df3473401876e0df4937c311fbaf")
+;;;;;;  ps-multibyte-buffer) "ps-mule" "ps-mule.el" "18a8bc30e8755ff27de7267f4bce3d99")
 ;;; Generated autoloads from ps-mule.el
 
 (defvar ps-multibyte-buffer nil "\
diff --git a/lisp/repeat.el b/lisp/repeat.el
index 9abe15c7253..b82522ef855 100644
--- a/lisp/repeat.el
+++ b/lisp/repeat.el
@@ -335,7 +335,7 @@ recently executed command not bound to an input event\"."
         (setq real-last-command 'repeat)
         (setq repeat-undo-count 1)
         (unwind-protect
-            (while (let ((evt (read-event))) ;FIXME: read-key maybe?
+            (while (let ((evt (read-key)))
                      ;; For clicks, we need to strip the meta-data to
                      ;; check the underlying event name.
                      (eq (or (car-safe evt) evt)
diff --git a/src/ChangeLog b/src/ChangeLog
index 46913c8a8b0..d33f9dd4f0b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-18  Ken Brown  <kbrown@cornell.edu>
+
+        * s/cygwin.h (SIGNALS_VIA_CHARACTERS): New define (bug#7225).
+
 2010-10-15  Kenichi Handa  <handa@m17n.org>
 
         Fix incorrect font metrics when the same font is opened with
diff --git a/src/s/cygwin.h b/src/s/cygwin.h
index 9ca5c67ce37..dcab55a91e1 100644
--- a/src/s/cygwin.h
+++ b/src/s/cygwin.h
@@ -132,6 +132,9 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
    returns ENOSYS.  A workaround is to set G_SLICE=always-malloc. */
 #define G_SLICE_ALWAYS_MALLOC
 
+/* Send signals to subprocesses by "typing" special chars at them.  */
+#define SIGNALS_VIA_CHARACTERS
+
 /* the end */
 
 /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b