Merge from emacs-23; up to 2010-06-11T14:39:54Z!cyd@stupidchicken.com.
authorGlenn Morris <rgm@gnu.org>
Tue, 17 May 2011 02:26:56 +0000 (19:26 -0700)
committerGlenn Morris <rgm@gnu.org>
Tue, 17 May 2011 02:26:56 +0000 (19:26 -0700)
24 files changed:
1  2 
doc/emacs/ChangeLog
doc/emacs/building.texi
doc/emacs/calendar.texi
doc/emacs/cmdargs.texi
doc/emacs/custom.texi
doc/emacs/display.texi
doc/emacs/emacs.texi
doc/emacs/fixit.texi
doc/emacs/frames.texi
doc/emacs/help.texi
doc/emacs/macos.texi
doc/emacs/mini.texi
doc/emacs/misc.texi
doc/emacs/msdog.texi
doc/emacs/mule.texi
doc/emacs/programs.texi
doc/emacs/rmail.texi
doc/emacs/text.texi
doc/emacs/trouble.texi
doc/emacs/windows.texi
doc/emacs/xresources.texi
lisp/ChangeLog
lisp/progmodes/python.el
lisp/vc/diff-mode.el

@@@ -1,28 -1,34 +1,58 @@@
 -2011-05-15  Chong Yidong  <cyd@stupidchicken.com>
++2011-05-17  Chong Yidong  <cyd@stupidchicken.com>
+       Fixes for fitting text into 7x9 printed manual.
+       * building.texi (Flymake, Breakpoints Buffer):
+       * calendar.texi (Appointments):
+       * cmdargs.texi (General Variables, Display X):
+       * custom.texi (Saving Customizations, Face Customization)
+       (Directory Variables, Minibuffer Maps, Init Rebinding):
+       * display.texi (Font Lock, Font Lock, Useless Whitespace):
+       * fixit.texi (Spelling):
+       * frames.texi (Creating Frames, Fonts):
+       * help.texi (Help Files):
+       * mini.texi (Minibuffer File):
+       * misc.texi (emacsclient Options, Emulation):
+       * msdog.texi (Windows Startup, Windows HOME, Windows Fonts):
+       * mule.texi (International Chars, Language Environments)
+       (Select Input Method, Modifying Fontsets, Charsets):
+       * programs.texi (Custom C Indent):
+       * rmail.texi (Rmail Labels):
+       * text.texi (Table Conversion):
+       * trouble.texi (Known Problems, Known Problems):
+       * windows.texi (Change Window):
+       * xresources.texi (GTK resources): Reflow text and re-indent code
+       examples to avoid TeX overflows and underflows on 7x9 paper.
+       * emacs.texi: Fix the (commented out) smallbook command.
+       * macos.texi (Mac / GNUstep Events):
+       * xresources.texi (Lucid Resources): Remove extraneous examples.
 -2011-04-13  Juanma Barranquero  <lekktu@gmail.com>
 +2011-05-10  Glenn Morris  <rgm@gnu.org>
 +
 +      * custom.texi (Specifying File Variables):
 +      Deprecate using mode: for minor modes.
 +
 +2011-05-07  Glenn Morris  <rgm@gnu.org>
 +
 +      * cal-xtra.texi (Sexp Diary Entries): Mention diary-hebrew-birthday.
 +
 +2011-05-06  Glenn Morris  <rgm@gnu.org>
 +
 +      * calendar.texi (Appointments): Mention appt-warning-time-regexp.
 +
 +      * cal-xtra.texi (Fancy Diary Display): Mention diary comments.
 +
 +2011-05-02  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * misc.texi (Emacs Server): Document `server-eval-at'.
 +
 +2011-04-24  Chong Yidong  <cyd@stupidchicken.com>
 +
 +      * maintaining.texi (List Tags): Document next-file.  Suggested by
 +      Uday S Reddy.
 +
 +2011-04-23  Juanma Barranquero  <lekktu@gmail.com>
  
        * mini.texi (Minibuffer Edit):
        * screen.texi (Mode Line): Fix typo.
Simple merge
Simple merge
Simple merge
@@@ -1331,10 -1333,10 +1332,11 @@@ corresponding alist applies to all the 
           (tab-width . 4)
           (fill-column . 80)))
   (c-mode . ((c-file-style . "BSD")))
 - (java-mode . ((c-file-style . "BSD")))
 + (java-mode . ((c-file-style . "BSD")
 +               (subdirs . nil)))
   ("src/imported"
-   . ((nil . ((change-log-default-name . "ChangeLog.local"))))))
+   . ((nil . ((change-log-default-name .
+               "ChangeLog.local"))))))
  @end example
  
  @noindent
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -428,36 -427,9 +428,29 @@@ and has its own resources.  The resourc
  @end iftex
  
  @example
 -Emacs.pane.menubar.font:  8x16
 +Emacs.pane.menubar.font:  Courier-12
 +@end example
 +
 +@noindent
 +To specify a font, use fontconfig font names as values to the @code{font}
 +resource, or old style names:
 +
 +@example
 +Emacs.pane.menubar.font: lucidasanstypewriter-10
  @end example
  
-   Thus, to specify @samp{-*-helvetica-medium-r-*--*-120-*-*-*-*-*-*,*}
- for both the popup and menu bar menus, write this:
- @example
- Emacs*menu*fontSet:  -*-helvetica-medium-r-*--*-120-*-*-*-*-*-*,*
- @end example
 +@noindent
 +Emacs first tries to open the font as an old style font, and if that fails
 +as an fontconfig font.  In rare cases, Emacs might do the wrong thing.
 +
 +@noindent
 +The Lucid menus can display multilingual text in your locale with old style
 +fonts.  For more information about fontsets see the man page for
 +@code{XCreateFontSet}.  To enable multilingual menu text you specify a
 +@code{fontSet} resource instead of the font resource.  If both
 +@code{font} and @code{fontSet} resources are specified, the
 +@code{fontSet} resource is used.
 +
  @noindent
  Resources for @emph{non-menubar} toolkit pop-up menus have
  @samp{menu*} instead of @samp{pane.menubar}.  For example, to specify
@@@ -471,18 -443,17 +464,9 @@@ Emacs.menu*.font:       8x1
  For dialog boxes, use @samp{dialog*}:
  
  @example
 -Emacs.dialog*.font:  8x16
 +Emacs.dialog*.font: Sans-12
  @end example
  
--@noindent
- The @samp{*menu*} as a wildcard matches @samp{pane.menubar} and
- @samp{menu@dots{}}.
- Experience shows that on some systems you may need to add
- @samp{shell.}@: before the @samp{pane.menubar} or @samp{menu*}.  On
- some other systems, you must not add @samp{shell.}.  The generic wildcard
- approach should work on both kinds of systems.
 -The Lucid menus can display multilingual text in your locale.  For
 -more information about fontsets see the man page for
 -@code{XCreateFontSet}.  To enable multilingual menu text you specify a
 -@code{fontSet} resource instead of the font resource.  If both
 -@code{font} and @code{fontSet} resources are specified, the
 -@code{fontSet} resource is used.
--
    Here is a list of the specific resources for menu bars and pop-up menus:
  
  @table @code
diff --cc lisp/ChangeLog
 -2011-05-16  Andreas Schwab  <schwab@linux-m68k.org>
++2011-05-17  Juanma Barranquero  <lekktu@gmail.com>
 -      * diff-mode.el (diff-fixup-modifs): Fix last change.
++      * progmodes/python.el (python-font-lock-keywords):
++      Add the Python 3.X keyword "nonlocal" (bug#8639).
 -2011-05-15  Chong Yidong  <cyd@stupidchicken.com>
 +2011-05-16  Stefan Monnier  <monnier@iro.umontreal.ca>
  
 -      * diff-mode.el (diff-fixup-modifs): Locate correct position for
 -      hunk-end tags (Bug#8672).
 +      * emacs-lisp/eieio.el (defmethod): Fix quoting of code (bug#8677).
  
 -2011-05-13  Juanma Barranquero  <lekktu@gmail.com>
 +2011-05-16  Kevin Ryde  <user42@zip.com.au>
  
 -      * progmodes/python.el (python-font-lock-keywords):
 -      Add the Python 3.X keyword "nonlocal" (bug#8639).
 +      * info-look.el (makefile-automake-mode): New setups, looking in
 +      automake manual, then makefile-mode.
 +      (makefile-mode): Remove automake manual, have it just in
 +      makefile-automake-mode since there's various things different or
 +      not relevant to plain make.
 +      (makefile-mode): Remove "other-modes" non-existent automake-mode,
 +      believe a hypothetical automake-mode would go to makefile-mode,
 +      not the other way around.
 +
 +2011-05-15  Chong Yidong  <cyd@stupidchicken.com>
  
 -2011-05-09  Eli Zaretskii  <eliz@gnu.org>
 +      * vc/diff-mode.el (diff-fixup-modifs): Locate correct position for
 +      hunk-end tags (Bug#8672).
 +
 +      * vc/vc-annotate.el (vc-annotate-mode-map): Bind = to
 +      vc-annotate-show-diff-revision-at-line (Bug#8671).
 +
 +2011-05-14  Glenn Morris  <rgm@gnu.org>
 +
 +      * vc/add-log.el (add-change-log-entry): Don't start adding a new entry
 +      in the middle of an existing one with multiple authors.  (Bug#8645)
 +      (change-log-font-lock-keywords): Also handle multiple author lines
 +      with leading tabs.  (Bug#8644)
 +
 +      * calendar/appt.el (appt-check): Rename some local variables.
 +      Some simplification/reordering.
 +
 +      * mail/feedmail.el (feedmail-confirm-outgoing-timeout)
 +      (feedmail-sendmail-f-doesnt-sell-me-out)
 +      (feedmail-queue-slug-suspect-regexp, feedmail-debug)
 +      (feedmail-debug-sit-for, feedmail-queue-express-hook)
 +      (feedmail-queue-runner-message-sender): Set :version.
 +      (bbdb-search, bbdb-records, smtp-via-smtp, smtp-server)
 +      (bbdb-dwim-net-address, vm-mail): Declare.
 +      (feedmail-binmail-gnulinuxish-template):
 +      Rename from feedmail-binmail-linuxish-template.
 +      (feedmail-buffer-to-smtp, feedmail-vm-mail-mode):
 +      Use insert-buffer-substring.
 +
 +2011-05-14  Bill Carpenter  <bill@carpenter.org>
 +
 +      * mail/feedmail.el (feedmail-patch-level): Increase.
 +      (feedmail-debug): New custom group.
 +      (feedmail-confirm-outgoing-timeout)
 +      (feedmail-sendmail-f-doesnt-sell-me-out)
 +      (feedmail-queue-slug-suspect-regexp, feedmail-debug)
 +      (feedmail-debug-sit-for, feedmail-queue-express-hook): New options.
 +      (feedmail-sender-line, feedmail-from-line)
 +      (feedmail-fiddle-headers-upwardly, feedmail-enable-spray)
 +      (feedmail-spray-this-address, )
 +      (feedmail-spray-address-fiddle-plex-list)
 +      (feedmail-queue-use-send-time-for-date)
 +      (feedmail-queue-use-send-time-for-message-id)
 +      (feedmail-last-chance-hook, feedmail-queue-runner-mode-setter)
 +      (feedmail-buffer-eating-function):
 +      Doc fixes.
 +      (feedmail-spray-via-bbdb, feedmail-buffer-to-smtp)
 +      (feedmail-vm-mail-mode, feedmail-message-action-scroll-up)
 +      (feedmail-message-action-scroll-down): New functions.
 +      (feedmail-queue-directory, feedmail-queue-draft-directory):
 +      Use expand-file-name.
 +      (feedmail-prompt-before-queue-standard-alist): Add scroll entries.
 +      Remove C-v help entry.
 +      (feedmail-queue-buffer-file-name): New variable.
 +      (feedmail-mail-send-hook-splitter, feedmail-buffer-to-binmail)
 +      (feedmail-buffer-to-smtpmail, feedmail-queue-express-to-draft)
 +      (feedmail-message-action-send-strong, feedmail-message-action-edit)
 +      (feedmail-message-action-draft, feedmail-message-action-draft-strong)
 +      (feedmail-message-action-queue, feedmail-message-action-queue-strong)
 +      (feedmail-message-action-toggle-spray)
 +      (feedmail-run-the-queue-no-prompts)
 +      (feedmail-run-the-queue-global-prompt, feedmail-queue-reminder)
 +      (feedmail-look-at-queue-directory, feedmail-queue-subject-slug-maker)
 +      (feedmail-create-queue-filename, feedmail-rfc822-time-zone):
 +      (feedmail-fiddle-header, feedmail-give-it-to-buffer-eater)
 +      (feedmail-envelope-deducer, feedmail-fiddle-from)
 +      (feedmail-fiddle-sender, feedmail-default-date-generator)
 +      (feedmail-fiddle-date, feedmail-fiddle-message-id)
 +      (feedmail-fiddle-spray-address)
 +      (feedmail-fiddle-list-of-spray-fiddle-plexes)
 +      (feedmail-fiddle-list-of-fiddle-plexes)
 +      (feedmail-fill-to-cc-function, feedmail-fill-this-one)
 +      (feedmail-one-last-look, feedmail-fqm-p): Add debug calls.
 +      (feedmail-queue-runner-message-sender, feedmail-binmail-template):
 +      Change default.  Doc fix.
 +      (feedmail-queue-runner-cleaner-upper): Use feedmail-say-chatter.
 +      (feedmail-binmail-linuxish-template): New constant.
 +      (feedmail-buffer-to-sendmail): Doc fix.  Add debug call.
 +      Respect feedmail-sendmail-f-doesnt-sell-me-out.
 +      (feedmail-send-it): Add debug call.
 +      Use feedmail-queue-buffer-file-name, and
 +      feedmail-send-it-immediately-wrapper.
 +      (feedmail-message-action-send): Add debug call.
 +      Use feedmail-send-it-immediately-wrapper.
 +      (feedmail-queue-express-to-queue): Add debug call.
 +      Run feedmail-queue-express-hook.
 +      (feedmail-message-action-help): Add debug call.  Use feedmail-p-h-b-n.
 +      (feedmail-message-action-help-blat):
 +      Rename from feedmail-queue-send-edit-prompt-help-first.
 +      (feedmail-run-the-queue): Add debug call.  Set buffer-file-type.
 +      Check line-endings.  Handle errors better.
 +      (feedmail-queue-reminder-brief, feedmail-queue-reminder-medium):
 +      Doc fix.  Add debug call.
 +      (feedmail-queue-send-edit-prompt): Doc fix.  Add debug call.
 +      Use feedmail-queue-send-edit-prompt-inner.
 +      (feedmail-queue-runner-prompt, feedmail-scroll-buffer): New functions.
 +      (feedmail-queue-send-edit-prompt-inner): New function, extracted
 +      from feedmail-queue-send-edit-prompt.
 +      (feedmail-queue-send-edit-prompt-help)
 +      (feedmail-queue-send-edit-prompt-help-later): Remove functions.
 +      (feedmail-tidy-up-slug): Add debug call.
 +      Respect feedmail-queue-slug-suspect-regexp.
 +      (feedmail-queue-subject-slug-maker): Use buffer-substring-no-properties.
 +      (feedmail-dump-message-to-queue): Add debug call.
 +      Expand queue-directory.
 +      (feedmail-dump-message-to-queue): Change message slightly.
 +      Use feedmail-say-chatter.
 +      (feedmail-rfc822-date): Add debug call.  Bind system-time-locale.
 +      (feedmail-send-it-immediately-wrapper): New function.
 +      (feedmail-send-it-immediately): Add debug calls.  Use let not let*.
 +      Insert empty string rather than newline.  Handle full-frame case.
 +      Use catch/throw.  Use feedmail-say-chatter.
 +      (feedmail-fiddle-from): Try mail-host-address.
 +      (feedmail-default-message-id-generator): Doc fix.
 +      Bind system-time-locale.  Handle missing end.
 +      (feedmail-fiddle-x-mailer): Add debug call.
 +      Handle feedmail-x-mailer-line being nil.
 +      (feedmail-accume-n-nuke-header, feedmail-deduce-address-list):
 +      Add debug call.  Use buffer-substring-no-properties.
 +      (feedmail-say-debug, feedmail-say-chatter): New functions.
 +      (feedmail-find-eoh): Give an explicit error.
 +
 +2011-05-13  Ulf Jasper  <ulf.jasper@web.de>
 +
 +      * net/newst-treeview.el (newsticker-treeview-face): Changed default
 +      family from helvetica to sans.
 +      (newsticker-treeview-tool-bar-map): Moved tool-bar icons to
 +      etc/images/newsticker.
 +
 +      * net/newst-reader.el (newsticker-feed-face): Changed default
 +      family from helvetica to sans.
 +
 +      * net/newst-plainview.el (newsticker-new-item-face)
 +      (newsticker-old-item-face, newsticker-immortal-item-face)
 +      (newsticker-obsolete-item-face, newsticker-date-face)
 +      (newsticker-statistics-face): Changed default family from
 +      helvetica to sans.
 +      (newsticker--plainview-tool-bar-map): Moved tool-bar icons to
 +      etc/images/newsticker.
 +
 +      * net/newst-backend.el (newsticker--do-run-auto-mark-filter),
 +      (newsticker--process-auto-mark-filter-match): : Tell user about
 +      auto-marking.
 +
 +2011-05-13  Didier Verna  <didier@xemacs.org>
 +
 +      Common Lisp indentation improvements on defmethod and lambda-lists.
 +      * cl-indent.el: Advertise the changes and remove obsolete TODO entries.
 +      (lisp-lambda-list-keyword-parameter-indentation)
 +      (lisp-lambda-list-keyword-parameter-alignment)
 +      (lisp-lambda-list-keyword-alignment): New customizable user options.
 +      (lisp-indent-defun-method): Improve docstring.
 +      (extended-loop-p): Fix comment.
 +      (lisp-indent-lambda-list-keywords-regexp): New variable.
 +      (lisp-indent-lambda-list): New function.
 +      (lisp-indent-259): Use it.
 +      (lisp-indent-defmethod): Support for more than one
 +      method qualifier and properly indent methods lambda-lists.
 +      (defgeneric): Provide a missing common-lisp-indent-function property.
 +
 +2011-05-13  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * thingatpt.el (bounds-of-thing-at-point): Return nil rather than
 +      bounds for the empty string (bug#8667).
 +
 +2011-05-13  Glenn Morris  <rgm@gnu.org>
 +
 +      * mail/feedmail.el (feedmail-buffer-to-sendmail): Require sendmail.
 +
 +      * mail/sendmail.el (sendmail-program): Try executable-find first.
 +      (sendmail-send-it): `sendmail-program' cannot be unbound.
 +
 +      * calendar/appt.el (appt-make-list): Simplify.
 +      (appt-time-msg-list): Doc fix.
 +      (appt-check): Change mode-line message at the time of the appointment.
 +
 +2011-05-12  Andreas Schwab  <schwab@linux-m68k.org>
 +
 +      * progmodes/ld-script.el (ld-script-keywords)
 +      (ld-script-builtins): Update keywords list.
 +
 +2011-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * progmodes/grep.el (grep-filter): Don't trip on partial lines.
 +
 +      * shell.el (shell-completion-vars): New function.
 +      (shell-mode):
 +      * simple.el (read-shell-command): Use it.
 +      (blink-matching-open): No need for " [...]" in minibuffer-message.
 +
 +2011-05-12  Glenn Morris  <rgm@gnu.org>
 +
 +      * calendar/appt.el (appt-now-displayed): Remove pointless variable.
 +      (appt-check): Simplify.
 +
 +2011-05-12  Eli Zaretskii  <eliz@gnu.org>
  
        * smerge-mode.el (smerge-resolve): Use null-device rather than a
        literal "/dev/null".
Simple merge
Simple merge