Merge from emacs-23; up to 2010-06-09T17:54:28Z!albinus@detlef.

doc/emacs/ChangeLog

+2011-04-23  Juanma Barranquero  <lekktu@gmail.com>
+
+	* mini.texi (Minibuffer Edit):
+	* screen.texi (Mode Line): Fix typo.
+
 2011-04-20  Christoph Scholtes  <cschol2112@googlemail.com>
 
 	* maintaining.texi (Old Revisions): Mention new function vc-ediff.

doc/emacs/mini.texi

@@ -164,7 +164,7 @@ however: for instance, you cannot split it.  @xref{Windows}.
 @vindex resize-mini-windows
   Normally, the minibuffer window occupies a single screen line.
 However, if you add two or more lines' worth of text into the
-minibuffer, it expands automatically to accomodate the text.  The
+minibuffer, it expands automatically to accommodate the text.  The
 variable @code{resize-mini-windows} controls the resizing of the
 minibuffer.  The default value is @code{grow-only}, which means the
 behavior we have just described.  If the value is @code{t}, the

doc/emacs/screen.texi

@@ -259,7 +259,7 @@ the buffer.  Minor modes are optional editing modes that provide
 additional features on top of the major mode.  @xref{Minor Modes}.
 
   Some features are listed together with the minor modes whenever they
-are turned on, even through they are not really minor modes.
+are turned on, even though they are not really minor modes.
 @samp{Narrow} means that the buffer being displayed has editing
 restricted to only a portion of its text (@pxref{Narrowing}).
 @samp{Def} means that a keyboard macro is currently being defined

doc/lispref/ChangeLog

+2011-04-23  Juanma Barranquero  <lekktu@gmail.com>
+
+	* windows.texi (Choosing Window): Fix typo.
+
+2011-04-23  Chong Yidong  <cyd@stupidchicken.com>
+
+	* frames.texi (Layout Parameters): Note the difference between
+	querying and setting parameters for left-fringe and right-fringe
+	(Bug#6930).
+
 2011-03-21  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* minibuf.texi (Basic Completion): Be a bit more precise about the

doc/lispref/frames.texi

@@ -681,17 +681,20 @@ use the default width.
 @itemx right-fringe
 The default width of the left and right fringes of windows in this
 frame (@pxref{Fringes}).  If either of these is zero, that effectively
-removes the corresponding fringe.  A value of @code{nil} stands for
-the standard fringe width, which is the width needed to display the
-fringe bitmaps.
+removes the corresponding fringe.
+
+When you use @code{frame-parameter} to query the value of either of
+these two frame parameters, the return value is always an integer.
+When using @code{set-frame-parameter}, passing a @code{nil} value
+imposes an actual default value of 8 pixels.
 
 The combined fringe widths must add up to an integral number of
-columns, so the actual default fringe widths for the frame may be
-larger than the specified values.  The extra width needed to reach an
-acceptable total is distributed evenly between the left and right
-fringe.  However, you can force one fringe or the other to a precise
-width by specifying that width as a negative integer.  If both widths are
-negative, only the left fringe gets the specified width.
+columns, so the actual default fringe widths for the frame, as
+reported by @code{frame-parameter}, may be larger than what you
+specify.  Any extra width is distributed evenly between the left and
+right fringe.  However, you can force one fringe or the other to a
+precise width by specifying that width as a negative integer.  If both
+widths are negative, only the left fringe gets the specified width.
 
 @vindex menu-bar-lines, a frame parameter
 @item menu-bar-lines

doc/lispref/windows.texi

@@ -1014,7 +1014,7 @@ a window only if the space taken up by that window can accommodate two
 windows one above the other that are both at least
 @code{window-min-height} lines tall.  Moreover, if the window that shall
 be split has a mode line, @code{split-window-sensibly} does not split
-the window unless the new window can accomodate a mode line too.
+the window unless the new window can accommodate a mode line too.
 @end defopt
 
 @defopt split-width-threshold

lisp/ChangeLog

+2011-04-23  Juanma Barranquero  <lekktu@gmail.com>
+
+	* buff-menu.el (Buffer-menu--buffers): Fix typo in docstring (bug#8535).
+
+	* play/mpuz.el (mpuz-silent): Doc fix.
+	(mpuz-mode-map): Use mapc.
+	(mpuz-put-number-on-board): Rename parameter L to COLUMNS.
+	(mpuz-letter-to-digit, mpuz-check-all-solved, mpuz-create-buffer):
+	Fix typos in docstrings.
+
+	* play/doctor.el (doc$, doctor-$, doctor-read-print, doctor-read-token)
+	(doctor-nounp, doctor-pronounp): Fix typos in docstrings.
+
+	* mouse-drag.el (mouse-drag-throw): Fix typo in docstring.
+
+2011-04-23  Chong Yidong  <cyd@stupidchicken.com>
+
+	* minibuffer.el (completion--do-completion): Avoid the "Next char
+	not unique" prompt if icomplete-mode is enabled (Bug#5849).
+
+	* mouse.el (mouse-drag-mode-line-1): Make sure that if we push
+	mouse-2 into unread-command-events, it is interpreted correctly.
+
+	* image-mode.el (image-type, image-mode-map, image-minor-mode-map)
+	(image-toggle-display): Doc fix.
+
+2011-04-23  Stephen Berman <stephen.berman@gmx.net>
+
+	* textmodes/page.el (what-page): Use line-number-at-pos to
+	calculate line number (Bug#6825).
+
 2011-04-22  Juanma Barranquero  <lekktu@gmail.com>
 
 	* eshell/esh-mode.el (find-tag-interactive): Declare function.

lisp/ChangeLog.14

@@ -4287,7 +4287,7 @@
 	(proced-descend): New variable.
 	(proced-sort): New arg descend.
 	(proced-sort-interactive): Repeated calls toggle sort order.
-	(proced-format): Accomodate changes of proced-format-alist.
+	(proced-format): Accommodate changes of proced-format-alist.
 	Undefined attributes are displayed as "?".
 	(proced-process-attributes): New optional arg pid-list.
 	Ignore processes with empty attribute list.

lisp/buff-menu.el

@@ -117,7 +117,7 @@ Auto Revert Mode.")
 (defvar Buffer-menu--buffers nil
   "If non-nil, list of buffers shown in the current buffer-menu.
 This variable determines whether reverting the buffer lists only
-this buffers.  It affects both manual reverting and reverting by
+these buffers.  It affects both manual reverting and reverting by
 Auto Revert Mode.")
 (make-variable-buffer-local 'Buffer-menu--buffers)
 

lisp/cedet/ChangeLog

+2011-04-23  Juanma Barranquero  <lekktu@gmail.com>
+
+	* ede/pconf.el (ede-proj-tweak-autoconf, ede-proj-flush-autoconf):
+	* ede/proj-comp.el (ede-proj-tweak-autoconf, ede-proj-flush-autoconf):
+	* ede/proj-elisp.el (ede-proj-tweak-autoconf, ede-proj-flush-autoconf)
+	(ede-proj-tweak-autoconf, ede-proj-flush-autoconf):
+	* ede/proj-scheme.el (ede-proj-tweak-autoconf): Fix typos in docstrings.
+
 2011-03-07  Chong Yidong  <cyd@stupidchicken.com>
 
 	* Version 23.3 released.

lisp/cedet/ede/pconf.el

@@ -159,7 +159,7 @@ don't do it.  A value of nil means to just do it.")
   (ede-proj-configure-synchronize this))
 
 (defmethod ede-proj-tweak-autoconf ((this ede-proj-target))
-  "Tweak the configure file (current buffer) to accomodate THIS."
+  "Tweak the configure file (current buffer) to accommodate THIS."
   ;; Check the compilers belonging to THIS, and call the autoconf
   ;; setup for those compilers.
   (mapc 'ede-proj-tweak-autoconf (ede-proj-compilers this))
@@ -167,7 +167,7 @@ don't do it.  A value of nil means to just do it.")
   )
 
 (defmethod ede-proj-flush-autoconf ((this ede-proj-target))
-  "Flush the configure file (current buffer) to accomodate THIS.
+  "Flush the configure file (current buffer) to accommodate THIS.
 By flushing, remove any cruft that may be in the file.  Subsequent
 calls to `ede-proj-tweak-autoconf' can restore items removed by flush."
   nil)

lisp/cedet/ede/proj-comp.el

@@ -236,7 +236,7 @@ This will prevent rules from creating duplicate variables or rules."
 
 ;;; Methods:
 (defmethod ede-proj-tweak-autoconf ((this ede-compilation-program))
-  "Tweak the configure file (current buffer) to accomodate THIS."
+  "Tweak the configure file (current buffer) to accommodate THIS."
   (mapcar
    (lambda (obj)
      (cond ((stringp obj)
@@ -248,7 +248,7 @@ This will prevent rules from creating duplicate variables or rules."
    (oref this autoconf)))
 
 (defmethod ede-proj-flush-autoconf ((this ede-compilation-program))
-  "Flush the configure file (current buffer) to accomodate THIS."
+  "Flush the configure file (current buffer) to accommodate THIS."
   nil)
 
 (defmacro proj-comp-insert-variable-once (varname &rest body)

lisp/cedet/ede/proj-elisp.el

@@ -208,7 +208,7 @@ is found, such as a `-version' variable, or the standard header."
       (error "Don't know how to update load path"))))
 
 (defmethod ede-proj-tweak-autoconf ((this ede-proj-target-elisp))
-  "Tweak the configure file (current buffer) to accomodate THIS."
+  "Tweak the configure file (current buffer) to accommodate THIS."
   (call-next-method)
   ;; Ok, now we have to tweak the autoconf provided `elisp-comp' program.
   (let ((ec (ede-expand-filename this "elisp-comp" 'newfile)))
@@ -232,7 +232,7 @@ is found, such as a `-version' variable, or the standard header."
 	(save-buffer)) )))
 
 (defmethod ede-proj-flush-autoconf ((this ede-proj-target-elisp))
-  "Flush the configure file (current buffer) to accomodate THIS."
+  "Flush the configure file (current buffer) to accommodate THIS."
   ;; Remove crufty old paths from elisp-compile
   (let ((ec (ede-expand-filename this "elisp-comp" 'newfile))
 	)
@@ -372,11 +372,11 @@ Argument THIS is the target which needs to insert an info file."
   )
 
 (defmethod ede-proj-tweak-autoconf ((this ede-proj-target-elisp-autoloads))
-  "Tweak the configure file (current buffer) to accomodate THIS."
+  "Tweak the configure file (current buffer) to accommodate THIS."
   (error "Autoloads not supported in autoconf yet"))
 
 (defmethod ede-proj-flush-autoconf ((this ede-proj-target-elisp-autoloads))
-  "Flush the configure file (current buffer) to accomodate THIS."
+  "Flush the configure file (current buffer) to accommodate THIS."
   nil)
 
 (provide 'ede/proj-elisp)

lisp/cedet/ede/proj-scheme.el

@@ -41,7 +41,7 @@
   "This target consists of scheme files.")
 
 (defmethod ede-proj-tweak-autoconf ((this ede-proj-target-scheme))
-  "Tweak the configure file (current buffer) to accomodate THIS."
+  "Tweak the configure file (current buffer) to accommodate THIS."
   (autoconf-insert-new-macro "AM_INIT_GUILE_MODULE"))
 
 (provide 'ede/proj-scheme)

lisp/image-mode.el

@@ -296,8 +296,7 @@ This function assumes the current frame has only one window."
 ;;; Image Mode setup
 
 (defvar image-type nil
-  "Current image type.
-This variable is used to display the current image type in the mode line.")
+  "The image type for the current Image mode buffer.")
 (make-variable-buffer-local 'image-type)
 
 (defvar image-mode-previous-major-mode nil
@@ -324,13 +323,13 @@ This variable is used to display the current image type in the mode line.")
     (define-key map [remap beginning-of-buffer] 'image-bob)
     (define-key map [remap end-of-buffer] 'image-eob)
     map)
-  "Major mode keymap for viewing images in Image mode.")
+  "Mode keymap for `image-mode'.")
 
 (defvar image-minor-mode-map
   (let ((map (make-sparse-keymap)))
     (define-key map "\C-c\C-c" 'image-toggle-display)
     map)
-  "Minor mode keymap for viewing images as text in Image mode.")
+  "Mode keymap for `image-minor-mode'.")
 
 (defvar bookmark-make-record-function)
 
@@ -520,9 +519,10 @@ was inserted."
 	(message "Repeat this command to go back to displaying the file as text"))))
 
 (defun image-toggle-display ()
-  "Start or stop displaying an image file as the actual image.
-This command toggles between `image-mode-as-text' showing the text of
-the image file and `image-mode' showing the image as an image."
+  "Toggle between image and text display.
+If the current buffer is displaying an image file as an image,
+call `image-mode-as-text' to switch to text.  Otherwise, display
+the image by calling `image-mode'."
   (interactive)
   (if (image-get-display-property)
       (image-mode-as-text)

lisp/minibuffer.el

@@ -657,7 +657,8 @@ E = after completion we now have an Exact match.
               (minibuffer-hide-completions))
              ;; Show the completion table, if requested.
              ((not exact)
-	      (if (cond ((null completion-show-inline-help) t)
+	      (if (cond (icomplete-mode t)
+			((null completion-show-inline-help) t)
 			((eq completion-auto-help 'lazy)
 			 (eq this-command last-command))
 			(t completion-auto-help))

lisp/mouse-drag.el

@@ -194,7 +194,7 @@ from the original mouse click to the current mouse location.  Try it;
 you'll like it.  It's easier to observe than to explain.
 
 If the mouse is clicked and released in the same place of time we
-assume that the user didn't want to scdebugroll but wanted to whatever
+assume that the user didn't want to scroll but wanted to whatever
 mouse-2 used to do, so we pass it through.
 
 Throw scrolling was inspired (but is not identical to) the \"hand\"

lisp/mouse.el

@@ -541,6 +541,9 @@ MODE-LINE-P non-nil means dragging a mode line; nil means a header line."
         ;; a `drag-mouse-1'.  In any case `on-link' would have been nulled
         ;; above if there had been any significant mouse movement.
         (when (and on-link (eq 'mouse-1 (car-safe event)))
+	  ;; If mouse-2 has never been done by the user, it doesn't
+	  ;; have the necessary property to be interpreted correctly.
+	  (put 'mouse-2 'event-kind 'mouse-click)
           (push (cons 'mouse-2 (cdr event)) unread-command-events))))))
 
 (defun mouse-drag-mode-line (start-event)

lisp/play/doctor.el

@@ -115,11 +115,11 @@
 (defun doc// (x) x)
 
 (defmacro doc$ (what)
-  "quoted arg form of doctor-$"
+  "Quoted arg form of doctor-$."
   `(doctor-$ ',what))
 
 (defun doctor-$ (what)
-  "Return the car of a list, rotating the list each time"
+  "Return the car of a list, rotating the list each time."
   (let* ((vv (symbol-value what))
 	(first (car vv))
 	(ww (append (cdr vv) (list first))))
@@ -832,7 +832,7 @@ Otherwise call the Doctor to parse preceding sentence."
     (newline arg)))
 
 (defun doctor-read-print nil
-  "top level loop"
+  "Top level loop."
   (interactive)
   (let ((sent (doctor-readin)))
     (insert "\n")
@@ -850,7 +850,7 @@ Otherwise call the Doctor to parse preceding sentence."
     sentence))
 
 (defun doctor-read-token ()
-  "read one word from buffer"
+  "Read one word from buffer."
   (prog1 (intern (downcase (buffer-substring (point)
 					     (progn
 					       (forward-word 1)
@@ -1020,7 +1020,7 @@ the subject noun, and return the portion of the sentence following it."
 	   nil))))
 
 (defun doctor-nounp (x)
-  "Returns t if the symbol argument is a noun."
+  "Return t if the symbol argument is a noun."
 	(or (doctor-pronounp x)
 	    (not (or (doctor-verbp x)
 		     (equal x 'not)
@@ -1028,7 +1028,7 @@ the subject noun, and return the portion of the sentence following it."
 		     (doctor-modifierp x) )) ))
 
 (defun doctor-pronounp (x)
-  "Returns t if the symbol argument is a pronoun."
+  "Return t if the symbol argument is a pronoun."
   (memq x '(
 	i me mine myself
 	we us ours ourselves ourself

lisp/play/mpuz.el

@@ -39,7 +39,7 @@
 
 (defcustom mpuz-silent 'error
   "Set this to nil if you want dings on inputs.
-t means never ding, and `error' means only ding on wrong input."
+The value t means never ding, and `error' means only ding on wrong input."
   :type '(choice (const :tag "No" nil)
 		 (const :tag "Yes" t)
 		 (const :tag "If correct" error))
@@ -88,33 +88,14 @@ t means never ding, and `error' means only ding on wrong input."
 
 (defvar mpuz-mode-map
   (let ((map (make-sparse-keymap)))
-    (define-key map "a" 'mpuz-try-letter)
-    (define-key map "b" 'mpuz-try-letter)
-    (define-key map "c" 'mpuz-try-letter)
-    (define-key map "d" 'mpuz-try-letter)
-    (define-key map "e" 'mpuz-try-letter)
-    (define-key map "f" 'mpuz-try-letter)
-    (define-key map "g" 'mpuz-try-letter)
-    (define-key map "h" 'mpuz-try-letter)
-    (define-key map "i" 'mpuz-try-letter)
-    (define-key map "j" 'mpuz-try-letter)
-    (define-key map "A" 'mpuz-try-letter)
-    (define-key map "B" 'mpuz-try-letter)
-    (define-key map "C" 'mpuz-try-letter)
-    (define-key map "D" 'mpuz-try-letter)
-    (define-key map "E" 'mpuz-try-letter)
-    (define-key map "F" 'mpuz-try-letter)
-    (define-key map "G" 'mpuz-try-letter)
-    (define-key map "H" 'mpuz-try-letter)
-    (define-key map "I" 'mpuz-try-letter)
-    (define-key map "J" 'mpuz-try-letter)
+    (mapc (lambda (ch)
+            (define-key map (char-to-string ch) 'mpuz-try-letter))
+          "abcdefghijABCDEFGHIJ")
     (define-key map "\C-g" 'mpuz-offer-abort)
     (define-key map "?" 'describe-mode)
     map)
   "Local keymap to use in Mult Puzzle.")
 
-
-
 (defun mpuz-mode ()
   "Multiplication puzzle mode.
 
@@ -171,7 +152,7 @@ You may abort a game by typing \\<mpuz-mode-map>\\[mpuz-offer-abort]."
   "A permutation from [0..9] to [0..9].")
 
 (defvar mpuz-letter-to-digit (make-vector 10 0)
-  "The inverse of mpuz-digit-to-letter.")
+  "The inverse of `mpuz-digit-to-letter'.")
 
 (defmacro mpuz-to-digit (letter)
   (list 'aref 'mpuz-letter-to-digit letter))
@@ -198,17 +179,16 @@ You may abort a game by typing \\<mpuz-mode-map>\\[mpuz-offer-abort]."
 (defvar mpuz-board (make-vector 10 nil)
   "The board associates to any digit the list of squares where it appears.")
 
-(defun mpuz-put-number-on-board (number row &rest l)
+(defun mpuz-put-number-on-board (number row &rest columns)
   "Put (last digit of) NUMBER on ROW and COLUMNS of the puzzle board."
   (let (digit)
-    (while l
+    (dolist (column columns)
       (setq digit (% number 10)
-	    number (/ number 10))
-      (aset mpuz-board digit `((,row . ,(car l)) ,@(aref mpuz-board digit)))
-      (setq l (cdr l)))))
+            number (/ number 10))
+      (aset mpuz-board digit `((,row . ,column) ,@(aref mpuz-board digit))))))
 
 (defun mpuz-check-all-solved (&optional row col)
-  "Check whether all digits have been solved. Return t if yes."
+  "Check whether all digits have been solved.  Return t if yes."
   (catch 'solved
     (let (A B1 B2 C D E squares)
       (and mpuz-solve-when-trivial
@@ -294,7 +274,7 @@ You may abort a game by typing \\<mpuz-mode-map>\\[mpuz-offer-abort]."
   "The general picture of the puzzle screen, as a string.")
 
 (defun mpuz-create-buffer ()
-  "Create (or recreate) the puzzle buffer. Return it."
+  "Create (or recreate) the puzzle buffer.  Return it."
   (let ((buf (get-buffer-create "*Mult Puzzle*"))
 	(face '(face mpuz-text))
 	buffer-read-only)