[Emacs-diffs] /srv/bzr/emacs/trunk r103134: Merge from emacs-23; up to r100454.

[Glenn Morris]

------------------------------------------------------------
revno: 103134 [merge]
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sat 2011-02-05 14:30:14 -0800
message:
  Merge from emacs-23; up to r100454.
modified:
  doc/emacs/ChangeLog
  doc/emacs/custom.texi
  doc/emacs/maintaining.texi
  doc/emacs/rmail.texi
  doc/lispref/ChangeLog
  doc/lispref/commands.texi
  etc/NEWS.23
  lisp/ChangeLog
  lisp/calendar/diary-lib.el
  lisp/emacs-lisp/cl-macs.el
  lisp/faces.el
  lisp/ibuf-ext.el
  lisp/progmodes/f90.el
  src/ChangeLog
  src/editfns.c
  src/ftfont.c
  src/window.c
  src/xfaces.c
  src/xftfont.c

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2011-01-31 23:54:50 +0000
+++ b/doc/emacs/ChangeLog       2011-02-05 22:30:14 +0000
@@ -1,3 +1,16 @@
+2011-02-05  Chong Yidong  <address@hidden>
+
+       * rmail.texi (Rmail Display): Document Rmail MIME support more
+       accurately.
+
+       * maintaining.texi (VC Change Log): Document vc-log-incoming and
+       vc-log-outgoing.
+       (Merging): Document vc-find-conflicted-file.
+
+2011-02-05  Glenn Morris  <address@hidden>
+
+       * custom.texi (Variables): Fix typo.
+
 2011-01-31  Chong Yidong  <address@hidden>
 
        * search.texi (Regexps): Copyedits.  Mention character classes

=== modified file 'doc/emacs/custom.texi'
--- a/doc/emacs/custom.texi     2011-01-25 04:08:28 +0000
+++ b/doc/emacs/custom.texi     2011-02-05 22:30:14 +0000
@@ -770,7 +770,7 @@
 most interesting variables for a non-programmer user are those meant
 for users to change---these are called @dfn{user options}.  @xref{Easy
 Customization}, for information about using the Customize facility to
-set user options.  In the following sections, we describe will other
+set user options.  In the following sections, we will describe other
 aspects of Emacs variables, such as how to set them outside Customize.
 
   Emacs Lisp allows any variable (with a few exceptions) to have any

=== modified file 'doc/emacs/maintaining.texi'
--- a/doc/emacs/maintaining.texi        2011-01-25 04:08:28 +0000
+++ b/doc/emacs/maintaining.texi        2011-02-05 22:30:14 +0000
@@ -907,6 +907,14 @@
 @item C-x v L
 Display the change history for the current repository
 (@code{vc-print-root-log}).
+
address@hidden C-x v I
+Display the changes that will be received with a pull operation
+(@code{vc-log-incoming}).
+
address@hidden C-x v O
+Display the changes that will be sent by the next push operation
+(@code{vc-log-outgoing}).
 @end table
 
 @kindex C-x v l
@@ -928,6 +936,19 @@
 the command prompts for the maximum number of revisions to display.
 RCS, SCCS, and CVS do not support this feature.
 
+  On a distributed version control system, the @kbd{C-x v I}
+(@code{vc-log-incoming}) command displays a log buffer showing the
+changes that will be applied, the next time you run the version
+control system's ``pull'' command to get new revisions from another
+repository.  This other repository is the default one from which
+changes are pulled, as defined by the version control system; with a
+prefix argument, @code{vc-log-incoming} prompts for a specific
+repository from which changes would be pulled, and lists the changes
+accordingly.  Similarly, @kbd{C-x v O} (@code{vc-log-outgoing}) shows
+the changes that will be sent to another repository, the next time you
+run the ``push'' command; with a prefix argument, it prompts for a
+specific repository to which changes would be pushed.
+
   In the @samp{*vc-change-log*} buffer, you can use the following keys
 to move between the logs of revisions and of files, to view past
 revisions, to modify change comments, to view annotations and to view
@@ -1381,12 +1402,18 @@
 @end group
 @end smallexample
 
address@hidden vc-resolve-conflicts
address@hidden vc-resolve-conflicts
   Then you can resolve the conflicts by editing the file manually.  Or
 you can type @code{M-x vc-resolve-conflicts} after visiting the file.
 This starts an Ediff session, as described above.  Don't forget to
 commit the merged version afterwards.
 
address@hidden vc-find-conflicted-file
+  If there is more than one conflicted file in a merge, type @kbd{M-x
+vc-find-conflicted-file} after resolving the conflicts in each file.
+This command visits the next conflicted file, and moves point to the
+first conflict marker in that file.
+
 @node Multi-User Branching
 @subsubsection Multi-User Branching
 

=== modified file 'doc/emacs/rmail.texi'
--- a/doc/emacs/rmail.texi      2011-01-25 04:08:28 +0000
+++ b/doc/emacs/rmail.texi      2011-02-05 22:30:14 +0000
@@ -1142,12 +1142,12 @@
 
 @cindex MIME messages (Rmail)
 @vindex rmail-enable-mime
-  By default, Rmail automatically decodes @acronym{MIME} (Multipurpose
-Internet Mail Extensions) messages.  If the message contains multiple
-parts (@acronym{MIME} entities), each part is represented by a tagline
-in the Rmail buffer.  The tagline summarizes the part's depth, index,
-and type, and may also contain a button for handling it, e.g. saving
-it to a file or displaying it as an image in the Rmail buffer.
+  If a message is in @acronym{MIME} (Multipurpose Internet Mail
+Extensions) format and contains multiple parts (@acronym{MIME}
+entities), Rmail displays each part with a @dfn{tagline}.  The tagline
+summarizes the part's index, size, and content type.  Depending on the
+content type, it may also contain one or more buttons; these perform
+actions such as saving the part into a file.
 
 @table @kbd
 @findex rmail-mime-toggle-hidden
@@ -1157,7 +1157,7 @@
 
 @findex rmail-mime-next-item
 @item @key{TAB}
-Move point to the next @acronym{MIME} part
+Move point to the next @acronym{MIME} tagline button.
 (@code{rmail-mime-next-item}).
 
 @findex rmail-mime-previous-item
@@ -1172,6 +1172,16 @@
 (@code{rmail-mime}).
 @end table
 
+  Each plain-text @acronym{MIME} part is initially displayed
+immediately after its tagline, as part of the Rmail buffer, while
address@hidden parts of other types are represented only by their
+taglines, with their actual contents hidden.  In either case, you can
+toggle a @acronym{MIME} part between its ``displayed'' and ``hidden''
+states by typing @key{RET} anywhere in the part---or anywhere in its
+tagline, apart from a tagline button for some other action.  Type
address@hidden (or click with the mouse) to activate a tagline button, and
address@hidden to cycle point between tagline buttons.
+
   The @kbd{v} (@code{rmail-mime}) command toggles between the default
 @acronym{MIME} display described above, and a ``raw'' display showing
 the undecoded @acronym{MIME} data.  With a prefix argument, this

=== modified file 'doc/lispref/ChangeLog'
--- a/doc/lispref/ChangeLog     2011-02-02 20:44:19 +0000
+++ b/doc/lispref/ChangeLog     2011-02-05 22:30:14 +0000
@@ -1,3 +1,8 @@
+2011-02-05  Chong Yidong  <address@hidden>
+
+       * commands.texi (Accessing Mouse): Note that a header line is not
+       included in the row of posn-col-row.
+
 2011-02-02  Chong Yidong  <address@hidden>
 
        * modes.texi (Major Mode Conventions): Add face guidelines.

=== modified file 'doc/lispref/commands.texi'
--- a/doc/lispref/commands.texi 2011-01-25 04:08:28 +0000
+++ b/doc/lispref/commands.texi 2011-02-05 22:30:14 +0000
@@ -1927,10 +1927,17 @@
 @end defun
 
 @defun posn-col-row position
-Return the row and column (in units of the frame's default character
-height and width) of @var{position}, as a cons cell @code{(@var{col} .
address@hidden)}.  These are computed from the @var{x} and @var{y} values
-actually found in @var{position}.
+This function returns a cons cell @code{(@var{col} .  @var{row})},
+containing the estimated column and row corresponding to buffer
+position @var{position}.  The return value is given in units of the
+frame's default character width and height, as computed from the
address@hidden and @var{y} values corresponding to @var{position}.  (So, if
+the actual characters have non-default sizes, the actual row and
+column may differ from these computed values.)
+
+Note that @var{row} is counted from the top of the text area.  If the
+window possesses a header line (@pxref{Header Lines}), it is
address@hidden counted as the first line.
 @end defun
 
 @defun posn-actual-col-row position

=== modified file 'etc/NEWS.23'
--- a/etc/NEWS.23       2011-01-25 04:08:28 +0000
+++ b/etc/NEWS.23       2011-02-05 22:30:14 +0000
@@ -17,28 +17,52 @@
 
 * Installation Changes in Emacs 23.3
 
-* Startup Changes in Emacs 23.3
+** New configure option --with-crt-dir specifies the location of your
+crt*.o files, if they are in a non-standard location.  This is only
+used on x86-64 and s390x GNU/Linux architectures.
 
 * Changes in Emacs 23.3
 
-+++
 ** The last-resort backup file `%backup%~' is now written to
 `user-emacs-directory', instead of the user's home directory.
 
-
-* Editing Changes in Emacs 23.3
+** If Emacs creates `user-emacs-directory', that directory's
+permissions are now set to rwx------, ignoring the umask.
 
 
 * Changes in Specialized Modes and Packages in Emacs 23.3
 
----
-** The appt-add command takes an optional argument for the warning time.
+** Calendar and diary
+
+*** The appt-add command takes an optional argument, the warning time.
 This can be used in place of the default appt-message-warning-time.
 
----
-** You can allow inferior Python processes to load modules from the
+** Python mode
+
+*** You can allow inferior Python processes to load modules from the
 current directory by setting `python-remove-cwd-from-path' to nil.
 
+** Rmail
+
+*** The default value of `rmail-enable-mime' is now t.  Rmail decodes
+MIME contents automatically.  You can customize the variable
+`rmail-enable-mime' back to `nil' to disable this automatic MIME
+decoding.
+
+*** The command `rmail-mime' change the displaying of a MIME message
+between decoded presentation form and raw data if `rmail-enable-mime'
+is non-nil.  And, with prefix argument, it change only the displaying
+of the MIME entity at point.
+
+*** The new command `rmail-mime-next-item' (bound to TAB) moves point
+to the next item of MIME message.
+
+*** The new command `rmail-mime-previous-item' (bound to backtab) moves
+point to the previous item of MIME message.
+
+*** The new command `rmail-mime-toggle-hidden' (RET) hide or show the
+body of the MIME entity at point.
+
 ** VC and related modes
 
 *** New VC command `vc-log-incoming', bound to `C-x v I'.
@@ -51,14 +75,12 @@
 
 *** New VC command vc-find-conflicted-file.
 
-+++
 *** The 'g' key in VC diff, log, log-incoming and log-outgoing buffers
 reruns the corresponding VC command to compute an up to date version
 of the buffer.
 
 *** vc-dir for Bzr supports viewing shelve contents and shelving snapshots.
 
-+++
 *** Special markup can be added to log-edit buffers.
 You can add headers specifying additional information to be supplied
 to the version control system.  For example:
@@ -71,30 +93,8 @@
 Git, Mercurial, and Monotone recognize "Author" and "Date".
 Any unknown header is left as is in the message, so it is not lost.
 
-** Rmail
-
-*** The default value of `rmail-enable-mime' is now t.  Rmail decodes
-MIME contents automatically.  You can customize the variable
-`rmail-enable-mime' back to `nil' to disable this automatic MIME
-decoding.
-
-*** The command `rmail-mime' change the displaying of a MIME message
-between decoded presentation form and raw data if `rmail-enable-mime'
-is non-nil.  And, with prefix argument, it change only the displaying
-of the MIME entity at point.
-
-*** The new command `rmail-mime-next-item' (bound to TAB) moves point
-to the next item of MIME message.
-
-*** The new command `rmail-mime-previous-item' (bound to backtab) moves
-point to the previous item of MIME message.
-
-*** The new command `rmail-mime-toggle-hidden' (RET) hide or show the
-body of the MIME entity at point.
-
 ** Obsolete packages
 
-+++
 *** lmenu.el and cl-compat.el are now obsolete.
 
 
@@ -115,26 +115,20 @@
 
 * Lisp changes in Emacs 23.3
 
-+++
 ** `e' and `pi' are now called `float-e' and `float-pi'.
   The old names are obsolete.
 
-+++
 ** The use of unintern without an obarray arg is now obsolete.
 
----
 ** The function `princ-list' is now obsolete.
 
-+++
 ** The yank-handler argument to kill-region and friends is now obsolete.
 
-+++
 ** New function byte-to-string, like char-to-string but for bytes.
 
 
 * Changes in Emacs 23.3 on non-free operating systems
 
-+++
 ** The nextstep port can have different modifiers for the left and right
 alt/option key by customizing the value for ns-right-alternate-modifier.
 

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-02-05 21:07:26 +0000
+++ b/lisp/ChangeLog    2011-02-05 22:30:14 +0000
@@ -1,3 +1,17 @@
+2011-02-05  Glenn Morris  <address@hidden>
+
+       * emacs-lisp/cl-macs.el (return-from): Fix doc typo.
+
+       * calendar/diary-lib.el (diary-font-lock-keywords):
+       Tweak diary-time-regexp match.  (Bug#7891)
+
+       * progmodes/f90.el (f90-find-tag-default): New function.  (Bug#7919)
+       (f90-mode): Use it for mode's `find-tag-default-function' property.
+
+       * ibuf-ext.el (ibuffer-filter-disable): Make it work.  (Bug#7969)
+
+       * faces.el (set-face-attribute): Doc fix.  (Bug#2659)
+
 2011-02-05  Deniz Dogan  <address@hidden>
 
        * net/rcirc.el (rcirc-handler-JOIN): Reset mode-line-process

=== modified file 'lisp/calendar/diary-lib.el'
--- a/lisp/calendar/diary-lib.el        2011-02-01 21:22:21 +0000
+++ b/lisp/calendar/diary-lib.el        2011-02-05 22:30:14 +0000
@@ -2331,9 +2331,19 @@
                          t))
      '(1 font-lock-reference-face))
     '(diary-font-lock-sexps . font-lock-keyword-face)
+    ;; Don't need to worry about space around "-" because the first
+    ;; match takes care of that.  It does mean the "-" itself may or
+    ;; may not be fontified though.
+    ;; diary-date-forms often include a final character that is not
+    ;; part of the date (eg a non-digit to mark the end of the year).
+    ;; This can use up the only space char between a date and time (b#7891).
+    ;; Hence we use OVERRIDE, which can only override whitespace.
+    ;; FIXME it's probably better to tighten up the diary-time-regexp
+    ;; and drop the whitespace requirement below.
     `(,(format "\\(^\\|\\s-\\)%s\\(-%s\\)?" diary-time-regexp
                diary-time-regexp)
-      . 'diary-time))))
+      . (0 'diary-time t)))))
+;      . 'diary-time))))
 
 (defvar diary-font-lock-keywords (diary-font-lock-keywords)
   "Forms to highlight in `diary-mode'.")

=== modified file 'lisp/emacs-lisp/cl-macs.el'
--- a/lisp/emacs-lisp/cl-macs.el        2011-01-25 04:08:28 +0000
+++ b/lisp/emacs-lisp/cl-macs.el        2011-02-05 22:30:14 +0000
@@ -628,7 +628,7 @@
 ;;;###autoload
 (defmacro return-from (name &optional result)
   "Return from the block named NAME.
-This jump out to the innermost enclosing `(block NAME ...)' form,
+This jumps out to the innermost enclosing `(block NAME ...)' form,
 returning RESULT from that form (or nil if RESULT is omitted).
 This is compatible with Common Lisp, but note that `defun' and
 `defmacro' do not create implicit blocks as they do in Common Lisp."

=== modified file 'lisp/faces.el'
--- a/lisp/faces.el     2011-02-01 21:37:12 +0000
+++ b/lisp/faces.el     2011-02-05 22:30:14 +0000
@@ -588,10 +588,14 @@
 
 `:height'
 
-VALUE must be either an integer specifying the height of the font to use
-in 1/10 pt, a floating point number specifying the amount by which to
-scale any underlying face, or a function, which is called with the old
-height (from the underlying face), and should return the new height.
+VALUE specifies the height of the font, in either absolute or relative
+terms.  An absolute height is an integer, and specifies font height in
+units of 1/10 pt.  A relative height is either a floating point number,
+which specifies a scaling factor for the underlying face height;
+or a function that takes a single argument (the underlying face height)
+and returns the new height.  Note that for the `default' face,
+you can only specify an absolute height (since there is nothing
+for it to be relative to).
 
 `:weight'
 

=== modified file 'lisp/ibuf-ext.el'
--- a/lisp/ibuf-ext.el  2011-01-25 04:08:28 +0000
+++ b/lisp/ibuf-ext.el  2011-02-05 22:30:14 +0000
@@ -771,7 +771,8 @@
 (defun ibuffer-filter-disable ()
   "Disable all filters currently in effect in this buffer."
   (interactive)
-  (setq ibuffer-filtering-qualifiers nil)
+  (setq ibuffer-filtering-qualifiers nil
+       ibuffer-filter-groups nil)
   (let ((buf (ibuffer-current-buffer)))
     (ibuffer-update nil t)
     (when buf

=== modified file 'lisp/progmodes/f90.el'
--- a/lisp/progmodes/f90.el     2011-01-25 04:08:28 +0000
+++ b/lisp/progmodes/f90.el     2011-02-05 22:30:14 +0000
@@ -2198,6 +2198,16 @@
   (save-excursion
     (nth 1 (f90-beginning-of-subprogram))))
 
+(defun f90-find-tag-default ()
+  "Function to use for `find-tag-default-function' property in F90 mode."
+  (let ((tag (find-tag-default)))
+    (or (and tag
+             ;; See bug#7919. TODO I imagine there are other cases...?
+             (string-match "%\\(.+\\)" tag)
+             (match-string-no-properties 1 tag))
+        tag)))
+
+(put 'f90-mode 'find-tag-default-function 'f90-find-tag-default)
 
 (defun f90-backslash-not-special (&optional all)
   "Make the backslash character (\\) be non-special in the current buffer.

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-05 10:20:15 +0000
+++ b/src/ChangeLog     2011-02-05 22:30:14 +0000
@@ -1,3 +1,23 @@
+2011-02-05  Glenn Morris  <address@hidden>
+
+       * xfaces.c (Finternal_set_lisp_face_attribute):
+       Try to clarify some error messages.  (Bug#2659)
+
+2011-02-05  Stefan Monnier  <address@hidden>
+
+       * editfns.c (save_restriction_restore): Don't forget to invalidate the
+       current_column cache (bug#7946).
+
+2011-02-05  Kenichi Handa  <address@hidden>
+
+       * ftfont.c (ftfont_open): Use FC_DUAL only when it is defined.
+
+       * xftfont.c (xftfont_open): Likewise.
+
+2011-02-05  Andreas Schwab  <address@hidden>
+
+       * window.c (Fselect_window): Add missing return value.
+
 2011-02-05  Paul Eggert  <address@hidden>
 
        xstrcasecmp: conform to C89 pointer rules

=== modified file 'src/editfns.c'
--- a/src/editfns.c     2011-02-01 07:23:48 +0000
+++ b/src/editfns.c     2011-02-05 22:30:14 +0000
@@ -3256,6 +3256,9 @@
        }
     }
 
+  /* Changing the buffer bounds invalidates any recorded current column.  */
+  invalidate_current_column ();
+
   if (cur)
     set_buffer_internal (cur);
 

=== modified file 'src/ftfont.c'
--- a/src/ftfont.c      2011-02-05 10:20:15 +0000
+++ b/src/ftfont.c      2011-02-05 22:30:14 +0000
@@ -1240,7 +1240,11 @@
     spacing = XINT (AREF (entity, FONT_SPACING_INDEX));
   else
     spacing = FC_PROPORTIONAL;
-  if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
+  if (spacing != FC_PROPORTIONAL
+#ifdef FC_DUAL
+      && spacing != FC_DUAL
+#endif /* FC_DUAL */
+      )
     font->min_width = font->average_width = font->space_width
       = (scalable ? ft_face->max_advance_width * size / upEM
         : ft_face->size->metrics.max_advance >> 6);

=== modified file 'src/window.c'
--- a/src/window.c      2011-01-25 04:08:28 +0000
+++ b/src/window.c      2011-02-05 22:30:14 +0000
@@ -3589,7 +3589,7 @@
 selected window before each command.  */)
      (register Lisp_Object window, Lisp_Object norecord)
 {
-  select_window (window, norecord, 0);
+  return select_window (window, norecord, 0);
 }
 
 static Lisp_Object

=== modified file 'src/xfaces.c'
--- a/src/xfaces.c      2011-02-05 10:20:15 +0000
+++ b/src/xfaces.c      2011-02-05 22:30:14 +0000
@@ -2899,7 +2899,7 @@
            {
              /* The default face must have an absolute size.  */
              if (!INTEGERP (value) || XINT (value) <= 0)
-               signal_error ("Invalid default face height", value);
+               signal_error ("Default face height not absolute and positive", 
value);
            }
          else
            {
@@ -2909,7 +2909,7 @@
                                                     make_number (10),
                                                     Qnil);
              if (!INTEGERP (test) || XINT (test) <= 0)
-               signal_error ("Invalid face height", value);
+               signal_error ("Face height does not produce a positive 
integer", value);
            }
        }
 

=== modified file 'src/xftfont.c'
--- a/src/xftfont.c     2011-01-25 04:08:28 +0000
+++ b/src/xftfont.c     2011-02-05 22:30:14 +0000
@@ -411,7 +411,11 @@
        ascii_printable[i] = ' ' + i;
     }
   BLOCK_INPUT;
-  if (spacing != FC_PROPORTIONAL && spacing != FC_DUAL)
+  if (spacing != FC_PROPORTIONAL
+#ifdef FC_DUAL
+      && spacing != FC_DUAL
+#endif /* FC_DUAL */
+      )
     {
       font->min_width = font->average_width = font->space_width
        = xftfont->max_advance_width;