Merge from trunk.

7 files changed, 73 insertions, 23 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f83dbdd344a..38651d42596 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,38 @@
+2011-09-30  Martin Rudalics  <rudalics@gmx.at>
+
+        * startup.el (command-line-1): Fix last fix by inserting
+        initial-scratch-message into *scratch* before displaying it.
+        (Bug#9605) and (Bug#9636)
+
+2011-09-29  Eli Zaretskii  <eliz@gnu.org>
+
+        * simple.el (line-move): If auto-hscroll-mode is disabled and the
+        window is hscrolled, move by logical lines.  (Bug#9607)
+        (line-move-visual): Update the doc string to the above effect.
+
+2011-09-29  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-record-window): When WINDOW is the
+        selected window use `point' instead of `window-point'.  (Bug#9626)
+
+        * startup.el (command-line-1): Use insert-before-markers when
+        inserting initial-scratch-message.  (Bug#9605)
+
+        * help.el (help-window): Remove variable.
+
+2011-09-29  Glenn Morris  <rgm@gnu.org>
+
+        * pcmpl-cvs.el (pcomplete/cvs): Add "status" handler.
+
+2011-09-29  Juanma Barranquero  <lekktu@gmail.com>
+
+        * descr-text.el (describe-char-categories): Accept category
+        descriptions more than one line long.
+
 2011-09-28  Stefan Monnier  <monnier@iro.umontreal.ca>
 
+        * simple.el (delete-trailing-whitespace): Fix last change.
+
         * progmodes/perl-mode.el (perl-syntax-propertize-function):
         Don't confuse "y => 3" as the beginning of a `y' operation.
 
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index fca06adb2a9..7d267cec480 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -366,9 +366,10 @@ This function is semi-obsolete.  Use `get-char-code-property'."
       (list (mapconcat
              (lambda (x)
                (let* ((c (category-docstring x))
-                      (doc (if (string-match "\\`\\(.*?\\)\n\\(.*\\)\\'" c)
+                      (doc (if (string-match "\\`\\(.*?\\)\n" c)
                                (propertize (match-string 1 c)
-                                           'help-echo (match-string 2 c))
+                                           'help-echo
+                                           (substring c (1+ (match-end 1))))
                              c)))
                  (format "%c:%s" x doc)))
              mnemonics ", ")))))
diff --git a/lisp/help.el b/lisp/help.el
index f4338c28ffb..e2af0759a65 100644
--- a/lisp/help.el
+++ b/lisp/help.el
@@ -37,17 +37,6 @@
 (add-hook 'temp-buffer-setup-hook 'help-mode-setup)
 (add-hook 'temp-buffer-show-hook 'help-mode-finish)
 
-;; The variable `help-window' below is used by `help-mode-finish' to
-;; communicate the window displaying help (the "help window") to the
-;; macro `with-help-window'.  The latter sets `help-window' to t before
-;; invoking `with-output-to-temp-buffer'.  If and only if `help-window'
-;; is eq to t, `help-mode-finish' (called by `temp-buffer-setup-hook')
-;; sets `help-window' to the window selected by `display-buffer'.
-;; Exiting `with-help-window' and calling `help-print-return-message'
-;; reset `help-window' to nil.
-(defvar help-window nil
-  "Window chosen for displaying help.")
-
 ;; `help-window-point-marker' is a marker you can move to a valid
 ;; position of the buffer shown in the help window in order to override
 ;; the standard positioning mechanism (`point-min') chosen by
diff --git a/lisp/pcmpl-cvs.el b/lisp/pcmpl-cvs.el
index 3ff07bca20e..9c9b72ab701 100644
--- a/lisp/pcmpl-cvs.el
+++ b/lisp/pcmpl-cvs.el
@@ -107,6 +107,10 @@
                     "j(pcmpl-cvs-tags '(?U ?P))"
                     "I(pcmpl-cvs-entries '(??))W?"))
            (while (pcomplete-here (pcmpl-cvs-entries '(?U ?P)))))
+          ((pcomplete-test "status")
+           (setq pcomplete-help "(cvs)File status")
+           (pcomplete-opt "vlR")
+           (while (pcomplete-here (pcmpl-cvs-entries))))
           (t
            (while (pcomplete-here (pcmpl-cvs-entries)))))))
 
diff --git a/lisp/simple.el b/lisp/simple.el
index 142270930ca..1ab90792bfa 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -589,9 +589,9 @@ If the region is active, only delete whitespace within the region."
         ;; Delete trailing empty lines.
         (goto-char end-marker)
         (when (and (not end)
-                   (<= (skip-chars-backward "\n") -2)
                    ;; Really the end of buffer.
-                   (save-restriction (widen) (eobp)))
+                   (save-restriction (widen) (eobp))
+                   (<= (skip-chars-backward "\n") -2))
           (delete-region (1+ (point)) end-marker))
         (set-marker end-marker nil))))
   ;; Return nil for the benefit of `write-file-functions'.
@@ -4244,7 +4244,9 @@ screen, instead of relying on buffer contents alone.  It takes
 into account variable-width characters and line continuation.
 If nil, `line-move' moves point by logical lines.
 A non-nil setting of `goal-column' overrides the value of this variable
-and forces movement by logical lines."
+and forces movement by logical lines.
+Disabling `auto-hscroll-mode' also overrides forces movement by logical
+lines when the window is horizontally scrolled."
   :type 'boolean
   :group 'editing-basics
   :version "23.1")
@@ -4321,7 +4323,15 @@ and forces movement by logical lines."
                (not executing-kbd-macro)
                (line-move-partial arg noerror to-end))
     (set-window-vscroll nil 0 t)
-    (if (and line-move-visual (not goal-column))
+    (if (and line-move-visual
+             ;; Display-based column are incompatible with goal-column.
+             (not goal-column)
+             ;; When auto-hscroll-mode is turned off and the text in
+             ;; the window is scrolled to the left, display-based
+             ;; motion doesn't make sense (because each logical line
+             ;; occupies exactly one screen line).
+             (not (and (null auto-hscroll-mode)
+                       (> (window-hscroll) 0))))
         (line-move-visual arg noerror)
       (line-move-1 arg noerror to-end))))
 
diff --git a/lisp/startup.el b/lisp/startup.el
index 6c3bb397e9a..16cf41506bd 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2307,13 +2307,13 @@ A fancy display is used on graphic displays, normal otherwise."
             ;; abort later.
             (unless (frame-live-p (selected-frame)) (kill-emacs nil))))))
 
-    (when initial-buffer-choice
-      (cond ((eq initial-buffer-choice t)
-             (switch-to-buffer (get-buffer-create "*scratch*")))
-            ((stringp initial-buffer-choice)
-             (find-file initial-buffer-choice))))
+    (when (eq initial-buffer-choice t)
+      ;; When initial-buffer-choice equals t make sure that *scratch*
+      ;; exists.
+      (get-buffer-create "*scratch*"))
 
     ;; If *scratch* exists and is empty, insert initial-scratch-message.
+    ;; Do this before switching to *scratch* below to handle bug#9605.
     (and initial-scratch-message
          (get-buffer "*scratch*")
          (with-current-buffer "*scratch*"
@@ -2321,6 +2321,12 @@ A fancy display is used on graphic displays, normal otherwise."
              (insert initial-scratch-message)
              (set-buffer-modified-p nil))))
 
+    (when initial-buffer-choice
+      (cond ((eq initial-buffer-choice t)
+             (switch-to-buffer (get-buffer-create "*scratch*")))
+            ((stringp initial-buffer-choice)
+             (find-file initial-buffer-choice))))
+
     (if (or inhibit-startup-screen
             initial-buffer-choice
             noninteractive
diff --git a/lisp/window.el b/lisp/window.el
index 512eebcc663..c6722a62c74 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -3833,7 +3833,14 @@ element is BUFFER."
        (list 'other
              ;; A quadruple of WINDOW's buffer, start, point and height.
              (list (window-buffer window) (window-start window)
-                   (window-point window) (window-total-size window))
+                   (if (eq window (selected-window))
+                       ;; When WINDOW is the selected window use its
+                       ;; buffer's `point' instead of `window-point'
+                       ;; (Bug#9626).
+                       (with-current-buffer (window-buffer window)
+                         (point))
+                     (window-point window))
+                   (window-total-size window))
              (selected-window) buffer))))
    ((eq type 'window)
     ;; WINDOW has been created on an existing frame.