Now on revision 109202. ------------------------------------------------------------ revno: 109202 committer: Paul Eggert branch nick: trunk timestamp: Tue 2012-07-24 22:48:19 -0700 message: Prefer typical American spelling for "acknowledgment". diff: === modified file 'admin/notes/bugtracker' --- admin/notes/bugtracker 2012-02-07 06:34:52 +0000 +++ admin/notes/bugtracker 2012-07-25 05:48:19 +0000 @@ -125,7 +125,7 @@ The "maintainer email address" is "bug-gnu-emacs@gnu.org" in most cases. -** To not get acknowledgement mail from the tracker, +** To not get acknowledgment mail from the tracker, add an "X-Debbugs-No-Ack:" header (with any value). If you use Gnus, you can add an element to gnus-posting-styles to do this automatically, eg: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2012-07-21 14:48:17 +0000 +++ doc/lispref/ChangeLog 2012-07-25 05:48:19 +0000 @@ -1,3 +1,8 @@ +2012-07-25 Paul Eggert + + Prefer typical American spelling for "acknowledgment". + * intro.texi (Acknowledgments): Rename from Acknowledgements. + 2012-07-21 Eli Zaretskii * commands.texi (Special Events): Mention language-change event. === modified file 'doc/lispref/elisp.texi' --- doc/lispref/elisp.texi 2012-07-06 04:25:04 +0000 +++ doc/lispref/elisp.texi 2012-07-25 05:48:19 +0000 @@ -254,7 +254,7 @@ * Lisp History:: Emacs Lisp is descended from Maclisp. * Conventions:: How the manual is formatted. * Version Info:: Which Emacs version is running? -* Acknowledgements:: The authors, editors, and sponsors of this manual. +* Acknowledgments:: The authors, editors, and sponsors of this manual. Conventions === modified file 'doc/lispref/intro.texi' --- doc/lispref/intro.texi 2012-07-06 07:48:10 +0000 +++ doc/lispref/intro.texi 2012-07-25 05:48:19 +0000 @@ -44,7 +44,7 @@ * Lisp History:: Emacs Lisp is descended from Maclisp. * Conventions:: How the manual is formatted. * Version Info:: Which Emacs version is running? -* Acknowledgements:: The authors, editors, and sponsors of this manual. +* Acknowledgments:: The authors, editors, and sponsors of this manual. @end menu @node Caveats @@ -523,8 +523,8 @@ 23.1, the value is 1. @end defvar -@node Acknowledgements -@section Acknowledgements +@node Acknowledgments +@section Acknowledgments This manual was originally written by Robert Krawitz, Bil Lewis, Dan LaLiberte, Richard@tie{}M. Stallman and Chris Welty, the volunteers of === modified file 'doc/lispref/spellfile' --- doc/lispref/spellfile 2011-12-19 06:21:24 +0000 +++ doc/lispref/spellfile 2012-07-25 05:48:19 +0000 @@ -1,6 +1,5 @@ ARPA Abbrev -Acknowledgements Alan Arnold Autoloading === modified file 'doc/man/emacs.1' --- doc/man/emacs.1 2012-06-10 13:20:58 +0000 +++ doc/man/emacs.1 2012-07-25 05:48:19 +0000 @@ -634,7 +634,7 @@ .SH AUTHORS .I Emacs was written by Richard Stallman and the Free Software Foundation. -For detailed credits and acknowledgements, see the GNU Emacs manual. +For detailed credits and acknowledgments, see the GNU Emacs manual. . . . === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2012-07-14 02:08:32 +0000 +++ doc/misc/ChangeLog 2012-07-25 05:48:19 +0000 @@ -1,3 +1,12 @@ +2012-07-25 Paul Eggert + + Prefer typical American spelling for "acknowledgment". + * calc.texi (History and Acknowledgments): Rename from + History and Acknowledgements. + * idlwave.texi (Acknowledgments): + * ses.texi (Acknowledgments): + * woman.texi (Acknowledgments): Rename from Acknowledgements. + 2012-07-09 Paul Eggert Rename configure.in to configure.ac (Bug#11603). === modified file 'doc/misc/calc.texi' --- doc/misc/calc.texi 2012-05-28 23:35:09 +0000 +++ doc/misc/calc.texi 2012-07-25 05:48:19 +0000 @@ -218,7 +218,7 @@ * Notations Used in This Manual:: * Demonstration of Calc:: * Using Calc:: -* History and Acknowledgements:: +* History and Acknowledgments:: @end menu @node What is Calc, About This Manual, Getting Started, Getting Started @@ -582,7 +582,7 @@ Press @key{DEL} repeatedly to remove any leftover results from the stack. To exit from Calc, press @kbd{q} or @kbd{C-x * c} again. -@node Using Calc, History and Acknowledgements, Demonstration of Calc, Getting Started +@node Using Calc, History and Acknowledgments, Demonstration of Calc, Getting Started @section Using Calc @noindent @@ -1148,8 +1148,8 @@ its initial state: Empty stack, and initial mode settings. @end table -@node History and Acknowledgements, , Using Calc, Getting Started -@section History and Acknowledgements +@node History and Acknowledgments, , Using Calc, Getting Started +@section History and Acknowledgments @noindent Calc was originally started as a two-week project to occupy a lull @@ -27779,7 +27779,7 @@ input units. If you want to disallow using inconsistent units, you can set the customizable variable -@code{calc-ensure-consistent-units} to @code{t} (@pxref{Customizing Calc}). In this case, +@code{calc-ensure-consistent-units} to @code{t} (@pxref{Customizing Calc}). In this case, if you request units which are inconsistent with the original units, you will be warned about it and no conversion will occur. @@ -35597,15 +35597,15 @@ @end defvar @defvar calc-ensure-consistent-units -When converting units, the variable @code{calc-ensure-consistent-units} -determines whether or not the target units need to be consistent with the +When converting units, the variable @code{calc-ensure-consistent-units} +determines whether or not the target units need to be consistent with the original units. If @code{calc-ensure-consistent-units} is @code{nil}, then -the target units don't need to have the same dimensions as the original units; -for example, converting @samp{100 ft/s} to @samp{m} will produce @samp{30.48 m/s}. -If @code{calc-ensure-consistent-units} is non-@code{nil}, then the target units -need to have the same dimensions as the original units; for example, converting -@samp{100 ft/s} to @samp{m} will result in an error, since @samp{ft/s} and @samp{m} -have different dimensions. The default value of @code{calc-ensure-consistent-units} +the target units don't need to have the same dimensions as the original units; +for example, converting @samp{100 ft/s} to @samp{m} will produce @samp{30.48 m/s}. +If @code{calc-ensure-consistent-units} is non-@code{nil}, then the target units +need to have the same dimensions as the original units; for example, converting +@samp{100 ft/s} to @samp{m} will result in an error, since @samp{ft/s} and @samp{m} +have different dimensions. The default value of @code{calc-ensure-consistent-units} is @code{nil}. @end defvar === modified file 'doc/misc/idlwave.texi' --- doc/misc/idlwave.texi 2012-02-28 08:17:21 +0000 +++ doc/misc/idlwave.texi 2012-07-25 05:48:19 +0000 @@ -71,7 +71,7 @@ * Getting Started:: Tutorial * The IDLWAVE Major Mode:: The mode for editing IDL programs * The IDLWAVE Shell:: The mode for running IDL as an inferior program -* Acknowledgements:: Who did what +* Acknowledgments:: Who did what * Sources of Routine Info:: How does IDLWAVE know about routine XYZ * HTML Help Browser Tips:: * Configuration Examples:: The user is king @@ -2361,7 +2361,7 @@ Normal hook. Executed when @file{idlwave.el} is loaded. @end defopt -@node The IDLWAVE Shell, Acknowledgements, The IDLWAVE Major Mode, Top +@node The IDLWAVE Shell, Acknowledgments, The IDLWAVE Major Mode, Top @chapter The IDLWAVE Shell @cindex IDLWAVE shell @cindex Major mode, @code{idlwave-shell-mode} @@ -3273,9 +3273,9 @@ (three underscores) are replaced by the indicated expression. @end defopt -@node Acknowledgements, Sources of Routine Info, The IDLWAVE Shell, Top -@chapter Acknowledgements -@cindex Acknowledgements +@node Acknowledgments, Sources of Routine Info, The IDLWAVE Shell, Top +@chapter Acknowledgments +@cindex Acknowledgments @cindex Maintainer, of IDLWAVE @cindex Authors, of IDLWAVE @cindex Contributors, to IDLWAVE @@ -3352,7 +3352,7 @@ @noindent Thanks to everyone! -@node Sources of Routine Info, HTML Help Browser Tips, Acknowledgements, Top +@node Sources of Routine Info, HTML Help Browser Tips, Acknowledgments, Top @appendix Sources of Routine Info @cindex Sources of routine information === modified file 'doc/misc/sc.texi' --- doc/misc/sc.texi 2012-06-10 13:20:58 +0000 +++ doc/misc/sc.texi 2012-07-25 05:48:19 +0000 @@ -221,7 +221,7 @@ @cindex nested citations @cindex citation -A @dfn{citation} is the acknowledgement of the original author of a mail +A @dfn{citation} is the acknowledgment of the original author of a mail message in the body of the reply. There are two basic citation styles which Supercite supports. The first, called @dfn{nested citations} is an anonymous form of citation; in other words, an indication is made === modified file 'doc/misc/ses.texi' --- doc/misc/ses.texi 2012-01-19 07:21:25 +0000 +++ doc/misc/ses.texi 2012-07-25 05:48:19 +0000 @@ -71,7 +71,7 @@ * Advanced Features:: Want to know more? * For Gurus:: Want to know @emph{even more}? * Index:: Concept, Function and Variable Index -* Acknowledgements:: Acknowledgements +* Acknowledgments:: Acknowledgments * GNU Free Documentation License:: The license for this documentation. @end menu @@ -927,15 +927,15 @@ @end table @c =================================================================== -@node Index, Acknowledgements, For Gurus, Top +@node Index, Acknowledgments, For Gurus, Top @unnumbered Index @printindex cp @c =================================================================== -@node Acknowledgements, GNU Free Documentation License, Index, Top -@chapter Acknowledgements +@node Acknowledgments, GNU Free Documentation License, Index, Top +@chapter Acknowledgments Coding by: @quotation @@ -976,7 +976,7 @@ @c =================================================================== -@node GNU Free Documentation License, , Acknowledgements, Top +@node GNU Free Documentation License, , Acknowledgments, Top @appendix GNU Free Documentation License @include doclicense.texi === modified file 'doc/misc/woman.texi' --- doc/misc/woman.texi 2012-02-29 08:11:23 +0000 +++ doc/misc/woman.texi 2012-07-25 05:48:19 +0000 @@ -94,7 +94,7 @@ * Log:: The *WoMan-Log* Buffer * Technical:: Technical Details * Bugs:: Reporting Bugs -* Acknowledgements:: Acknowledgements +* Acknowledgments:: Acknowledgments * GNU Free Documentation License:: The license for this documentation. * Command Index:: Command Index * Variable Index:: Variable Index @@ -1306,7 +1306,7 @@ @c =================================================================== -@node Bugs, Acknowledgements, Technical, Top +@node Bugs, Acknowledgments, Technical, Top @comment node-name, next, previous, up @chapter Reporting Bugs @cindex reporting bugs @@ -1331,10 +1331,10 @@ @c =================================================================== -@node Acknowledgements, GNU Free Documentation License, Bugs, Top +@node Acknowledgments, GNU Free Documentation License, Bugs, Top @comment node-name, next, previous, up -@chapter Acknowledgements -@cindex acknowledgements +@chapter Acknowledgments +@cindex acknowledgments For Heather, Kathryn and Madelyn, the women in my life (although they will probably never use it)! @@ -1388,7 +1388,7 @@ @page -@node GNU Free Documentation License, Command Index, Acknowledgements, Top +@node GNU Free Documentation License, Command Index, Acknowledgments, Top @appendix GNU Free Documentation License @include doclicense.texi === modified file 'leim/SKK-DIC/SKK-JISYO.L' --- leim/SKK-DIC/SKK-JISYO.L 2011-06-12 10:37:40 +0000 +++ leim/SKK-DIC/SKK-JISYO.L 2012-07-25 05:48:19 +0000 @@ -34,7 +34,7 @@ ;; the Free Software Foundation Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;; -;; ACKNOWLEDGEMENT +;; ACKNOWLEDGMENT ;; ;; この辞書は、SKK 原作者の佐藤雅彦先生が、第 1 版作成のために東北大学 ;; 電気通信研究所佐藤研究室 (当時) の学生さん達とともに scratch から作 === modified file 'leim/ja-dic/ja-dic.el' --- leim/ja-dic/ja-dic.el 2011-02-26 09:48:22 +0000 +++ leim/ja-dic/ja-dic.el 2012-07-25 05:48:19 +0000 @@ -47,7 +47,7 @@ ;; the Free Software Foundation Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. ;; -;; ACKNOWLEDGEMENT +;; ACKNOWLEDGMENT ;; ;; この辞書は、SKK 原作者の佐藤雅彦先生が、第 1 版作成のために東北大学 ;; 電気通信研究所佐藤研究室 (当時) の学生さん達とともに scratch から作 === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-25 02:38:36 +0000 +++ lisp/ChangeLog 2012-07-25 05:48:19 +0000 @@ -1,3 +1,9 @@ +2012-07-25 Paul Eggert + + Prefer typical American spelling for "acknowledgment". + * vc/add-log.el (change-log-acknowledgment): Rename from + change-log-acknowledgement, with an alias for the old name. + 2012-07-25 Jay Belanger * calc-alg.el (math-simplify-divide): Don't cross multiply === modified file 'lisp/completion.el' --- lisp/completion.el 2012-05-04 23:16:47 +0000 +++ lisp/completion.el 2012-07-25 05:48:19 +0000 @@ -228,7 +228,7 @@ ;; superior to that of the LISPM version. ;; ;;----------------------------------------------- -;; Acknowledgements +;; Acknowledgments ;;----------------------------------------------- ;; Cliff Lasser (cal@think.com), Kevin Herbert (kph@cisco.com), ;; eero@media-lab, kgk@cs.brown.edu, jla@ai.mit.edu, === modified file 'lisp/emulation/cua-rect.el' --- lisp/emulation/cua-rect.el 2012-04-19 17:20:26 +0000 +++ lisp/emulation/cua-rect.el 2012-07-25 05:48:19 +0000 @@ -21,7 +21,7 @@ ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see . -;;; Acknowledgements +;;; Acknowledgments ;; The rectangle handling and display code borrows from the standard ;; GNU emacs rect.el package and the rect-mark.el package by Rick === modified file 'lisp/emulation/viper.el' --- lisp/emulation/viper.el 2012-04-09 13:05:48 +0000 +++ lisp/emulation/viper.el 2012-07-25 05:48:19 +0000 @@ -103,8 +103,8 @@ ;; (require 'viper) ;; -;;; Acknowledgements: -;; ----------------- +;;; Acknowledgments: +;; ---------------- ;; Bug reports and ideas contributed by many users have helped ;; improve Viper and the various versions of VIP. ;; See the on-line manual for a complete list of contributors. === modified file 'lisp/hippie-exp.el' --- lisp/hippie-exp.el 2012-01-19 07:21:25 +0000 +++ lisp/hippie-exp.el 2012-07-25 05:48:19 +0000 @@ -156,7 +156,7 @@ ;; opposite situation to occur, that `hippie-expand' misses some ;; suggestion because it thinks it has already tried it. ;; -;; Acknowledgement +;; Acknowledgment ;; ;; I want to thank Mikael Djurfeldt in discussions with whom the idea ;; of this function took form. === modified file 'lisp/ido.el' --- lisp/ido.el 2012-06-20 15:51:34 +0000 +++ lisp/ido.el 2012-07-25 05:48:19 +0000 @@ -279,7 +279,7 @@ ;; can be used by other packages to read a buffer name, a file name, ;; or a directory name in the `ido' way. -;;; Acknowledgements +;;; Acknowledgments ;; Infinite amounts of gratitude goes to Stephen Eglen ;; who wrote iswitch-buffer mode - from which I ripped off 99% of the code === modified file 'lisp/iswitchb.el' --- lisp/iswitchb.el 2012-05-04 06:02:23 +0000 +++ lisp/iswitchb.el 2012-07-25 05:48:19 +0000 @@ -233,7 +233,7 @@ ;;; TODO -;;; Acknowledgements +;;; Acknowledgments ;; Thanks to Jari Aalto for help with the ;; first version of this package, iswitch-buffer. Thanks also to many === modified file 'lisp/mail/emacsbug.el' --- lisp/mail/emacsbug.el 2012-06-06 18:13:09 +0000 +++ lisp/mail/emacsbug.el 2012-07-25 05:48:19 +0000 @@ -212,7 +212,7 @@ (insert ". Please check that the From: line contains a valid email address. After a delay of up -to one day, you should receive an acknowledgement at that address. +to one day, you should receive an acknowledgment at that address. Please write in English if possible, as the Emacs maintainers usually do not have translators for other languages.\n\n"))) === modified file 'lisp/mail/mspools.el' --- lisp/mail/mspools.el 2012-04-09 13:05:48 +0000 +++ lisp/mail/mspools.el 2012-07-25 05:48:19 +0000 @@ -83,7 +83,7 @@ ;; Useful settings for VM ;; vm-auto-get-new-mail should be t (the default). -;; Acknowledgements +;; Acknowledgments ;; Thanks to jond@mitre.org (Jonathan Doughty) for help with code for ;; setting up vm-spool-files. === modified file 'lisp/mail/rfc2368.el' --- lisp/mail/rfc2368.el 2012-01-19 07:21:25 +0000 +++ lisp/mail/rfc2368.el 2012-07-25 05:48:19 +0000 @@ -33,7 +33,7 @@ ;; ;; this is intended as a replacement for mailto.el ;; -;; acknowledgements: +;; acknowledgments: ;; ;; the functions that deal w/ unhexifying in this file were basically ;; taken from w3 -- i hope to replace them w/ something else soon OR === modified file 'lisp/progmodes/cmacexp.el' --- lisp/progmodes/cmacexp.el 2012-04-09 13:05:48 +0000 +++ lisp/progmodes/cmacexp.el 2012-07-25 05:48:19 +0000 @@ -80,7 +80,7 @@ ;; making comments visible in the expansion. ;; - All work is done in core memory, no need for temporary files. -;; ACKNOWLEDGEMENTS ================================================== +;; ACKNOWLEDGMENTS =================================================== ;; A lot of thanks to Don Maszle who did a great work of testing, bug ;; reporting and suggestion of new features. This work has been === modified file 'lisp/progmodes/ebnf-yac.el' --- lisp/progmodes/ebnf-yac.el 2012-01-19 07:21:25 +0000 +++ lisp/progmodes/ebnf-yac.el 2012-07-25 05:48:19 +0000 @@ -73,8 +73,8 @@ ;; example: this_is_a_valid.name, Another_EXAMPLE, mIxEd.CaSe. ;; ;; -;; Acknowledgements -;; ---------------- +;; Acknowledgments +;; --------------- ;; ;; Thanks to Matthew K. Junker for the suggestion to deal ;; with %right, %left and %prec pragmas. His suggestion was extended to deal === modified file 'lisp/progmodes/ebnf2ps.el' --- lisp/progmodes/ebnf2ps.el 2012-04-22 13:58:00 +0000 +++ lisp/progmodes/ebnf2ps.el 2012-07-25 05:48:19 +0000 @@ -1128,8 +1128,8 @@ ;; . Optimizations... ;; ;; -;; Acknowledgements -;; ---------------- +;; Acknowledgments +;; --------------- ;; ;; Thanks to Eli Zaretskii for some doc fixes. ;; === modified file 'lisp/progmodes/vhdl-mode.el' --- lisp/progmodes/vhdl-mode.el 2012-06-02 10:56:09 +0000 +++ lisp/progmodes/vhdl-mode.el 2012-07-25 05:48:19 +0000 @@ -102,7 +102,7 @@ ;; VHDL Mode distribution. ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; -;; Acknowledgements +;; Acknowledgments ;; Electrification ideas by Bob Pack ;; and Steve Grout. @@ -4499,7 +4499,7 @@ (mra) architecture is selected. If another architecture is desired, it can be marked as most-recently-analyzed (speedbar menu) before generating the configuration. - + Note: Configurations of subcomponents (i.e. hierarchical configuration declarations) are currently not considered when displaying configurations in speedbar. @@ -6979,7 +6979,7 @@ (save-excursion (goto-char new) (eq new (progn (back-to-indentation) (point))))) - (setq placeholder new))) + (setq placeholder new))) (vhdl-add-syntax 'statement-cont placeholder) (if begin-after-ip (vhdl-add-syntax 'block-open))) === modified file 'lisp/vc/add-log.el' --- lisp/vc/add-log.el 2012-04-09 13:05:48 +0000 +++ lisp/vc/add-log.el 2012-07-25 05:48:19 +0000 @@ -223,13 +223,15 @@ (define-obsolete-face-alias 'change-log-function-face 'change-log-function "22.1") -(defface change-log-acknowledgement +(defface change-log-acknowledgment '((t (:inherit font-lock-comment-face))) "Face for highlighting acknowledgments." :version "21.1" :group 'change-log) +(define-obsolete-face-alias 'change-log-acknowledgement + 'change-log-acknowledgment "24.2") (define-obsolete-face-alias 'change-log-acknowledgement-face - 'change-log-acknowledgement "22.1") + 'change-log-acknowledgment "22.1") (defconst change-log-file-names-re "^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)") (defconst change-log-start-entry-re "^\\sw.........[0-9:+ ]*") @@ -271,14 +273,14 @@ ;; Function of change. ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function)) ;; - ;; Acknowledgements. + ;; Acknowledgments. ;; Don't include plain "From" because that is vague; ;; we want to encourage people to say something more specific. ;; Note that the FSF does not use "Patches by"; our convention ;; is to put the name of the author of the changes at the top ;; of the change log entry. ("\\(^\\( +\\|\t\\)\\| \\)\\(Thanks to\\|Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)" - 3 'change-log-acknowledgement)) + 3 'change-log-acknowledgment)) "Additional expressions to highlight in Change Log mode.") (defun change-log-search-file-name (where) === modified file 'lisp/vc/ediff.el' --- lisp/vc/ediff.el 2012-07-16 10:19:56 +0000 +++ lisp/vc/ediff.el 2012-07-25 05:48:19 +0000 @@ -101,7 +101,7 @@ ;; and on any buffer. -;;; Acknowledgements: +;;; Acknowledgments: ;; Ediff was inspired by Dale R. Worley's emerge.el. ;; Ediff would not have been possible without the help and encouragement of === modified file 'lisp/vc/vc-git.el' --- lisp/vc/vc-git.el 2012-07-19 14:38:01 +0000 +++ lisp/vc/vc-git.el 2012-07-25 05:48:19 +0000 @@ -772,7 +772,7 @@ (list (cons (nth 1 vc-git-root-log-format) (nth 2 vc-git-root-log-format))) (append - `((,log-view-message-re (1 'change-log-acknowledgement))) + `((,log-view-message-re (1 'change-log-acknowledgment))) ;; Handle the case: ;; user: foo@bar '(("^Author:[ \t]+\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)" @@ -788,8 +788,8 @@ (1 'change-log-name) (2 'change-log-email)) ("^Merge: \\([0-9a-z]+\\) \\([0-9a-z]+\\)" - (1 'change-log-acknowledgement) - (2 'change-log-acknowledgement)) + (1 'change-log-acknowledgment) + (2 'change-log-acknowledgment)) ("^Date: \\(.+\\)" (1 'change-log-date)) ("^summary:[ \t]+\\(.+\\)" (1 'log-view-message))))))) === modified file 'lisp/whitespace.el' --- lisp/whitespace.el 2012-06-08 16:39:49 +0000 +++ lisp/whitespace.el 2012-07-25 05:48:19 +0000 @@ -309,8 +309,8 @@ ;; buffer is visited or written. ;; ;; -;; Acknowledgements -;; ---------------- +;; Acknowledgments +;; --------------- ;; ;; Thanks to felix (EmacsWiki) for keeping highlight when switching between ;; major modes on a file. === modified file 'lisp/windmove.el' --- lisp/windmove.el 2012-01-21 10:02:34 +0000 +++ lisp/windmove.el 2012-07-25 05:48:19 +0000 @@ -118,7 +118,7 @@ ;; (setq windmove-window-distance-delta 2) ;; -;; Acknowledgements: +;; Acknowledgments: ;; ;; Special thanks to Julian Assange (proff@iq.org), whose ;; change-windows-intuitively.el predates Windmove, and provided the === modified file 'lisp/woman.el' --- lisp/woman.el 2012-07-11 23:13:41 +0000 +++ lisp/woman.el 2012-07-25 05:48:19 +0000 @@ -368,8 +368,8 @@ ;; http://cm.bell-labs.com/7thEdMan/ -;; Acknowledgements -;; ================ +;; Acknowledgments +;; =============== ;; For Heather, Kathryn and Madelyn, the women in my life ;; (although they will probably never use it)! ------------------------------------------------------------ revno: 109201 committer: Dmitry Antipov branch nick: trunk timestamp: Wed 2012-07-25 09:09:02 +0400 message: Adjust buffer text indirection counters at the end of Fkill_buffer. * buffer.c (Fkill_buffer): Adjust indirection counters when the buffer is definitely dead. This should really fix an issue reported by Christoph Scholtes again. (Bug#12007). (init_buffer_once): Initialize indirection counters of buffer_defaults and buffer_local_symbols (for sanity and safety). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-24 16:34:15 +0000 +++ src/ChangeLog 2012-07-25 05:09:02 +0000 @@ -1,3 +1,12 @@ +2012-07-25 Dmitry Antipov + + Adjust buffer text indirection counters at the end of Fkill_buffer. + * buffer.c (Fkill_buffer): Adjust indirection counters when the + buffer is definitely dead. This should really fix an issue reported + by Christoph Scholtes again. (Bug#12007). + (init_buffer_once): Initialize indirection counters of + buffer_defaults and buffer_local_symbols (for sanity and safety). + 2012-07-24 Eli Zaretskii * xdisp.c (init_iterator): Don't compute dimensions of truncation @@ -7,7 +16,7 @@ 2012-07-24 Dmitry Antipov Simplify copy_overlay. - * buffer.c (copy_overlay): Simplify, use build_marker. + * buffer.c (copy_overlay): Simplify. Use build_marker. * lisp.h (struct Lisp_Overlay): Restore comment with minor tweaks. 2012-07-23 Eli Zaretskii === modified file 'src/buffer.c' --- src/buffer.c 2012-07-24 06:45:44 +0000 +++ src/buffer.c 2012-07-25 05:09:02 +0000 @@ -1560,14 +1560,6 @@ if (EQ (buffer, XWINDOW (minibuf_window)->buffer)) return Qnil; - /* Notify our base buffer that we don't share the text anymore. */ - if (b->base_buffer) - { - eassert (b->indirections == -1); - b->base_buffer->indirections--; - eassert (b->base_buffer->indirections >= 0); - } - /* When we kill an ordinary buffer which shares it's buffer text with indirect buffer(s), we must kill indirect buffer(s) too. We do it at this stage so nothing terrible happens if they @@ -1708,7 +1700,15 @@ BVAR (b, name) = Qnil; BLOCK_INPUT; - if (! b->base_buffer) + if (b->base_buffer) + { + /* Notify our base buffer that we don't share the text anymore. */ + eassert (b->indirections == -1); + b->base_buffer->indirections--; + eassert (b->base_buffer->indirections >= 0); + } + else + /* No one shares our buffer text, can free it. */ free_buffer_text (b); if (b->newline_cache) @@ -4897,6 +4897,9 @@ /* Prevent GC from getting confused. */ buffer_defaults.text = &buffer_defaults.own_text; buffer_local_symbols.text = &buffer_local_symbols.own_text; + /* No one will share the text with these buffers, but let's play it safe. */ + buffer_defaults.indirections = 0; + buffer_local_symbols.indirections = 0; BUF_INTERVALS (&buffer_defaults) = 0; BUF_INTERVALS (&buffer_local_symbols) = 0; XSETPVECTYPESIZE (&buffer_defaults, PVEC_BUFFER, pvecsize); ------------------------------------------------------------ revno: 109200 committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2012-07-25 03:22:25 +0000 message: nnimap.el (nnimap-get-responses): Don't remove, still used diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-07-24 22:17:17 +0000 +++ lisp/gnus/ChangeLog 2012-07-25 03:22:25 +0000 @@ -1,3 +1,7 @@ +2012-07-25 Katsumi Yamaoka + + * nnimap.el (nnimap-get-responses): Don't remove, still used. + 2012-07-24 Julien Danjou * mail-source.el (mail-source-movemail-and-remove): Remove, unused. === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2012-07-24 22:17:17 +0000 +++ lisp/gnus/nnimap.el 2012-07-25 03:22:25 +0000 @@ -1852,6 +1852,15 @@ (forward-line 1))) (buffer-substring (point) end)))) +(defun nnimap-get-responses (sequences) + (let (responses) + (dolist (sequence sequences) + (goto-char (point-min)) + (when (re-search-forward (format "^%d " sequence) nil t) + (push (list sequence (nnimap-parse-response)) + responses))) + responses)) + (defvar nnimap-incoming-split-list nil) (defun nnimap-fetch-inbox (articles) ------------------------------------------------------------ revno: 109199 committer: Jay Belanger branch nick: trunk timestamp: Tue 2012-07-24 21:38:36 -0500 message: calc-alg.el (math-simplify-divide): Don't cross multiply in an equation when the lhs is a variable. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-24 22:17:17 +0000 +++ lisp/ChangeLog 2012-07-25 02:38:36 +0000 @@ -1,3 +1,8 @@ +2012-07-25 Jay Belanger + + * calc-alg.el (math-simplify-divide): Don't cross multiply + in an equation when the lhs is a variable. + 2012-07-24 Julien Danjou * net/netrc.el (netrc-find-service-number, netrc-store-data): === modified file 'lisp/calc/calc-alg.el' --- lisp/calc/calc-alg.el 2012-01-19 07:21:25 +0000 +++ lisp/calc/calc-alg.el 2012-07-25 02:38:36 +0000 @@ -530,7 +530,10 @@ (not (Math-realp (nth 1 math-simplify-expr)))) (math-common-constant-factor (nth 1 math-simplify-expr)))) (if (and (eq (car-safe nn) 'frac) (eq (nth 1 nn) 1) (not n)) - (progn + (unless (and (eq (car-safe math-simplify-expr) 'calcFunc-eq) + (eq (car-safe (nth 1 math-simplify-expr)) 'var) + (not (math-expr-contains (nth 2 math-simplify-expr) + (nth 1 math-simplify-expr)))) (setcar (cdr math-simplify-expr) (math-mul (nth 2 nn) (nth 1 math-simplify-expr))) (setcar (cdr (cdr math-simplify-expr)) ------------------------------------------------------------ revno: 109198 author: Julien Danjou committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2012-07-24 22:17:17 +0000 message: Merge changes made in Gnus master; Remove dead code * mail-source.el (mail-source-movemail-and-remove): Remove, unused. * nntp.el (nntp-send-nosy-authinfo, nntp-send-authinfo-from-file) (nntp-async-timer-handler): Remove, unused. * nnimap.el (nnimap-get-responses): Remove, unused. * nnheader.el (mail-header-set-extra): Remove, unused. * netrc.el (netrc-find-service-number, netrc-store-data): Remove, unused. * mm-view.el (mm-view-sound-file): Remove, unused. * mm-url.el (mm-url-fetch-simple, mm-url-fetch-form) (mm-url-encode-multipart-form-data): Remove, unused. * message.el (message-remove-signature, message-make-host-name) (message-fill-address): Remove, unused. * gnus.el (gnus-writable-groups, gnus-group-guess-prefixed-name) (gnus-group-guess-full-name, gnus-group-guess-prefixed-name): Remove, unused. * gnus-uu.el (gnus-uu-find-name-in-shar): Remove, unused. * gnus-util.el (gnus-extract-address-component-name) (gnus-extract-address-component-email, gnus-sortable-date) (gnus-alist-to-hashtable, gnus-hashtable-to-alist) (gnus-process-live-p): Remove, unused. * gnus-topic.el (gnus-group-parent-topic): Remove, unused. * gnus-sum.el (gnus-score-set-default, gnus-article-parent-p) (gnus-article-read-p, gnus-uncompress-marks): Remove, unused. (gnus-summary-set-current-mark): Remove obsolete, empty and unused function. * gnus-start.el (gnus-kill-newsgroup): Remove unused obsolete function. * gnus-score.el (gnus-summary-score-crossposting) (gnus-score-regexp-bad-p): Remove, unused. * gnus-salt.el (gnus-tree-goto-article): Remove, unused. * gnus-range.el (gnus-sublist-p): Remove, unused. * gnus-msg.el (gnus-mail-parse-comma-list, gnus-put-message): Remove, unused. * gnus-kill.el (gnus-Newsgroup-kill-file): Remove, unused. * gnus-int.el (gnus-list-active-group, gnus-request-group-articles) (gnus-request-associate-buffer): Remove, unused. * gnus-group.el (gnus-group-set-method-info) (gnus-group-set-params-info): Remove, unused. * gnus-fun.el (gnus-shell-command-to-string) (gnus-shell-command-on-region): Remove, unused. * gnus-cite.el (gnus-cited-line-p): Remove, unused. * gnus-art.el (gnus-article-text-type-exists-p) (article-translate-characters, gnus-article-hide-text-of-type) (gnus-kill-sticky-article-buffers, gnus-article-maybe-highlight): Remove, unused. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-07-23 17:27:41 +0000 +++ lisp/ChangeLog 2012-07-24 22:17:17 +0000 @@ -1,3 +1,8 @@ +2012-07-24 Julien Danjou + + * net/netrc.el (netrc-find-service-number, netrc-store-data): + Remove, unused. + 2012-07-23 Eli Zaretskii * startup.el (command-line): Don't display an empty user name in === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-07-23 11:26:29 +0000 +++ lisp/gnus/ChangeLog 2012-07-24 22:17:17 +0000 @@ -1,3 +1,70 @@ +2012-07-24 Julien Danjou + + * mail-source.el (mail-source-movemail-and-remove): Remove, unused. + + * nntp.el (nntp-send-nosy-authinfo, nntp-send-authinfo-from-file) + (nntp-async-timer-handler): Remove, unused. + + * nnimap.el (nnimap-get-responses): Remove, unused. + + * nnheader.el (mail-header-set-extra): Remove, unused. + + * mm-view.el (mm-view-sound-file): Remove, unused. + + * mm-url.el (mm-url-fetch-simple, mm-url-fetch-form) + (mm-url-encode-multipart-form-data): Remove, unused. + + * message.el (message-remove-signature, message-make-host-name) + (message-fill-address): Remove, unused. + + * gnus.el (gnus-writable-groups, gnus-group-guess-prefixed-name) + (gnus-group-guess-full-name, gnus-group-guess-prefixed-name): Remove, + unused. + + * gnus-uu.el (gnus-uu-find-name-in-shar): Remove, unused. + + * gnus-util.el (gnus-extract-address-component-name) + (gnus-extract-address-component-email, gnus-sortable-date) + (gnus-alist-to-hashtable, gnus-hashtable-to-alist) + (gnus-process-live-p): Remove, unused. + + * gnus-topic.el (gnus-group-parent-topic): Remove, unused. + + * gnus-sum.el (gnus-score-set-default, gnus-article-parent-p) + (gnus-article-read-p, gnus-uncompress-marks): Remove, unused. + (gnus-summary-set-current-mark): Remove obsolete, empty and unused + function. + + * gnus-start.el (gnus-kill-newsgroup): Remove unused obsolete function. + + * gnus-score.el (gnus-summary-score-crossposting) + (gnus-score-regexp-bad-p): Remove, unused. + + * gnus-salt.el (gnus-tree-goto-article): Remove, unused. + + * gnus-range.el (gnus-sublist-p): Remove, unused. + + * gnus-msg.el (gnus-mail-parse-comma-list, gnus-put-message): Remove, + unused. + + * gnus-kill.el (gnus-Newsgroup-kill-file): Remove, unused. + + * gnus-int.el (gnus-list-active-group, gnus-request-group-articles) + (gnus-request-associate-buffer): Remove, unused. + + * gnus-group.el (gnus-group-set-method-info) + (gnus-group-set-params-info): Remove, unused. + + * gnus-fun.el (gnus-shell-command-to-string) + (gnus-shell-command-on-region): Remove, unused. + + * gnus-cite.el (gnus-cited-line-p): Remove, unused. + + * gnus-art.el (gnus-article-text-type-exists-p) + (article-translate-characters, gnus-article-hide-text-of-type) + (gnus-kill-sticky-article-buffers, gnus-article-maybe-highlight): + Remove, unused. + 2012-07-23 Katsumi Yamaoka * nnir.el ("nnir"): Revert last change, that's premature to merge from === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2012-07-03 00:25:57 +0000 +++ lisp/gnus/gnus-art.el 2012-07-24 22:17:17 +0000 @@ -1794,14 +1794,6 @@ (put-text-property (max (1- b) (point-min)) b 'intangible nil))) -(defun gnus-article-hide-text-of-type (type) - "Hide text of TYPE in the current buffer." - (save-excursion - (let ((b (point-min)) - (e (point-max))) - (while (setq b (text-property-any b e 'article-type type)) - (add-text-properties b (incf b) gnus-hidden-properties))))) - (defun gnus-article-delete-text-of-type (type) "Delete text of TYPE in the current buffer." (save-excursion @@ -1834,10 +1826,6 @@ b (or (text-property-not-all b (point-max) 'invisible t) (point-max))))))) -(defun gnus-article-text-type-exists-p (type) - "Say whether any text of type TYPE exists in the buffer." - (text-property-any (point-min) (point-max) 'article-type type)) - (defsubst gnus-article-header-rank () "Give the rank of the string HEADER as given by `gnus-sorted-header-list'." (let ((list gnus-sorted-header-list) @@ -2146,23 +2134,6 @@ props) (insert replace))))))))) -(defun article-translate-characters (from to) - "Translate all characters in the body of the article according to FROM and TO. -FROM is a string of characters to translate from; to is a string of -characters to translate to." - (save-excursion - (when (article-goto-body) - (let ((inhibit-read-only t) - (x (make-string 225 ?x)) - (i -1)) - (while (< (incf i) (length x)) - (aset x i i)) - (setq i 0) - (while (< i (length from)) - (aset x (aref from i) (aref to i)) - (incf i)) - (translate-region (point) (point-max) x))))) - (defun article-translate-strings (map) "Translate all string in the body of the article according to MAP. MAP is an alist where the elements are on the form (\"from\" \"to\")." @@ -4804,18 +4775,6 @@ (when (eq major-mode 'gnus-sticky-article-mode) (gnus-kill-buffer buffer)))) -(defun gnus-kill-sticky-article-buffers (arg) - "Kill all sticky article buffers. -If a prefix ARG is given, ask for confirmation." - (interactive "P") - (dolist (buf (gnus-buffers)) - (with-current-buffer buf - (when (eq major-mode 'gnus-sticky-article-mode) - (if (not arg) - (gnus-kill-buffer buf) - (when (yes-or-no-p (concat "Kill buffer " (buffer-name buf) "? ")) - (gnus-kill-buffer buf))))))) - ;;; ;;; Gnus MIME viewing functions ;;; @@ -6770,11 +6729,6 @@ (gnus-article-hide-citation-maybe arg force) (gnus-article-hide-signature arg)) -(defun gnus-article-maybe-highlight () - "Do some article highlighting if article highlighting is requested." - (when (gnus-visual-p 'article-highlight 'highlight) - (gnus-article-highlight-some))) - (defun gnus-check-group-server () ;; Make sure the connection to the server is alive. (unless (gnus-server-opened === modified file 'lisp/gnus/gnus-cite.el' --- lisp/gnus/gnus-cite.el 2012-06-26 22:52:31 +0000 +++ lisp/gnus/gnus-cite.el 2012-07-24 22:17:17 +0000 @@ -1164,18 +1164,6 @@ (while vars (make-local-variable (pop vars))))) -(defun gnus-cited-line-p () - "Say whether the current line is a cited line." - (save-excursion - (beginning-of-line) - (let ((found nil)) - (dolist (prefix (mapcar 'car gnus-cite-prefix-alist)) - (when (string= (buffer-substring (point) (+ (length prefix) (point))) - prefix) - (setq found t))) - found))) - - ;; Highlighting of different citation levels in message-mode. ;; - message-cite-prefix will be overridden if this is enabled. === modified file 'lisp/gnus/gnus-fun.el' --- lisp/gnus/gnus-fun.el 2012-01-19 07:21:25 +0000 +++ lisp/gnus/gnus-fun.el 2012-07-24 22:17:17 +0000 @@ -85,13 +85,6 @@ (call-process shell-file-name nil (list standard-output nil) nil shell-command-switch command))) -(defun gnus-shell-command-on-region (start end command) - "A simplified `shell-command-on-region'. -Output to the current buffer, replace text, and don't mingle error." - (call-process-region start end shell-file-name t - (list (current-buffer) nil) - nil shell-command-switch command)) - ;;;###autoload (defun gnus-random-x-face () "Return X-Face header data chosen randomly from `gnus-x-face-directory'." === modified file 'lisp/gnus/gnus-group.el' --- lisp/gnus/gnus-group.el 2012-06-26 22:52:31 +0000 +++ lisp/gnus/gnus-group.el 2012-07-24 22:17:17 +0000 @@ -4450,12 +4450,6 @@ (gnus-list-of-unread-articles (car info)))))) (error "No such group: %s" (gnus-info-group info)))))) -(defun gnus-group-set-method-info (group select-method) - (gnus-group-set-info select-method group 'method)) - -(defun gnus-group-set-params-info (group params) - (gnus-group-set-info params group 'params)) - ;; Ad-hoc function for inserting data from a different newsrc.eld ;; file. Use with caution, if at all. (defun gnus-import-other-newsrc-file (file) === modified file 'lisp/gnus/gnus-int.el' --- lisp/gnus/gnus-int.el 2012-06-26 22:52:31 +0000 +++ lisp/gnus/gnus-int.el 2012-07-24 22:17:17 +0000 @@ -416,14 +416,6 @@ dont-check info))) -(defun gnus-list-active-group (group) - "Request active information on GROUP." - (let ((gnus-command-method (gnus-find-method-for-group group)) - (func 'list-active-group)) - (when (gnus-check-backend-function func group) - (funcall (gnus-get-function gnus-command-method func) - (gnus-group-real-name group) (nth 1 gnus-command-method))))) - (defun gnus-request-group-description (group) "Request a description of GROUP." (let ((gnus-command-method (gnus-find-method-for-group group)) @@ -432,14 +424,6 @@ (funcall (gnus-get-function gnus-command-method func) (gnus-group-real-name group) (nth 1 gnus-command-method))))) -(defun gnus-request-group-articles (group) - "Request a list of existing articles in GROUP." - (let ((gnus-command-method (gnus-find-method-for-group group)) - (func 'request-group-articles)) - (when (gnus-check-backend-function func group) - (funcall (gnus-get-function gnus-command-method func) - (gnus-group-real-name group) (nth 1 gnus-command-method))))) - (defun gnus-close-group (group) "Request the GROUP be closed." (let ((gnus-command-method (inline (gnus-find-method-for-group group)))) @@ -798,11 +782,6 @@ (gnus-agent-regenerate-group group (list article))) result)) -(defun gnus-request-associate-buffer (group) - (let ((gnus-command-method (gnus-find-method-for-group group))) - (funcall (gnus-get-function gnus-command-method 'request-associate-buffer) - (gnus-group-real-name group)))) - (defun gnus-request-restore-buffer (article group) "Request a new buffer restored to the state of ARTICLE." (let ((gnus-command-method (gnus-find-method-for-group group))) === modified file 'lisp/gnus/gnus-kill.el' --- lisp/gnus/gnus-kill.el 2012-01-19 07:21:25 +0000 +++ lisp/gnus/gnus-kill.el 2012-07-24 22:17:17 +0000 @@ -328,24 +328,6 @@ ;; For kill files -(defun gnus-Newsgroup-kill-file (newsgroup) - "Return the name of a kill file for NEWSGROUP. -If NEWSGROUP is nil, return the global kill file instead." - (cond ((or (null newsgroup) - (string-equal newsgroup "")) - ;; The global kill file is placed at top of the directory. - (expand-file-name gnus-kill-file-name gnus-kill-files-directory)) - (gnus-use-long-file-name - ;; Append ".KILL" to capitalized newsgroup name. - (expand-file-name (concat (gnus-capitalize-newsgroup newsgroup) - "." gnus-kill-file-name) - gnus-kill-files-directory)) - (t - ;; Place "KILL" under the hierarchical directory. - (expand-file-name (concat (gnus-newsgroup-directory-form newsgroup) - "/" gnus-kill-file-name) - gnus-kill-files-directory)))) - (defun gnus-expunge (marks) "Remove lines marked with MARKS." (with-current-buffer gnus-summary-buffer === modified file 'lisp/gnus/gnus-msg.el' --- lisp/gnus/gnus-msg.el 2012-06-26 22:52:31 +0000 +++ lisp/gnus/gnus-msg.el 2012-07-24 22:17:17 +0000 @@ -1457,33 +1457,6 @@ (when (gnus-y-or-n-p "Send this complaint? ") (message-send-and-exit)))))) -(defun gnus-mail-parse-comma-list () - (let (accumulated - beg) - (skip-chars-forward " ") - (while (not (eobp)) - (setq beg (point)) - (skip-chars-forward "^,") - (while (zerop - (save-excursion - (save-restriction - (let ((i 0)) - (narrow-to-region beg (point)) - (goto-char beg) - (logand (progn - (while (search-forward "\"" nil t) - (incf i)) - (if (zerop i) 2 i)) - 2))))) - (skip-chars-forward ",") - (skip-chars-forward "^,")) - (skip-chars-backward " ") - (push (buffer-substring beg (point)) - accumulated) - (skip-chars-forward "^,") - (skip-chars-forward ", ")) - accumulated)) - (defun gnus-inews-add-to-address (group) (let ((to-address (mail-fetch-field "to"))) (when (and to-address @@ -1494,41 +1467,6 @@ (format "Do you want to add this as `to-list': %s? " to-address)) (gnus-group-add-parameter group (cons 'to-list to-address)))))) -(defun gnus-put-message () - "Put the current message in some group and return to Gnus." - (interactive) - (let ((reply gnus-article-reply) - (winconf gnus-prev-winconf) - (group gnus-newsgroup-name)) - (unless (and group - (not (gnus-group-read-only-p group))) - (setq group (read-string "Put in group: " nil (gnus-writable-groups)))) - - (when (gnus-group-entry group) - (error "No such group: %s" group)) - (save-excursion - (save-restriction - (widen) - (message-narrow-to-headers) - (let ((gnus-deletable-headers nil)) - (message-generate-headers - (if (message-news-p) - message-required-news-headers - message-required-mail-headers))) - (goto-char (point-max)) - (if (string-match " " group) - (insert "Gcc: \"" group "\"\n") - (insert "Gcc: " group "\n")) - (widen))) - (gnus-inews-do-gcc) - (when (and (get-buffer gnus-group-buffer) - (gnus-buffer-exists-p (car-safe reply)) - (cdr reply)) - (set-buffer (car reply)) - (gnus-summary-mark-article-as-replied (cdr reply))) - (when winconf - (set-window-configuration winconf)))) - (defun gnus-article-mail (yank) "Send a reply to the address near point. If YANK is non-nil, include the original article." === modified file 'lisp/gnus/gnus-range.el' --- lisp/gnus/gnus-range.el 2012-01-19 07:21:25 +0000 +++ lisp/gnus/gnus-range.el 2012-07-24 22:17:17 +0000 @@ -592,15 +592,6 @@ (setq sum (+ sum (if (consp x) (- (cdr x) (car x) -1) 1)))))))) -(defun gnus-sublist-p (list sublist) - "Test whether all elements in SUBLIST are members of LIST." - (let ((sublistp t)) - (while sublist - (unless (memq (pop sublist) list) - (setq sublistp nil - sublist nil))) - sublistp)) - (defun gnus-range-add (range1 range2) "Add RANGE2 to RANGE1 (nondestructively)." (unless (listp (cdr range1)) === modified file 'lisp/gnus/gnus-salt.el' --- lisp/gnus/gnus-salt.el 2012-01-19 07:21:25 +0000 +++ lisp/gnus/gnus-salt.el 2012-07-24 22:17:17 +0000 @@ -536,12 +536,6 @@ (when pos (cons pos (next-single-property-change pos 'gnus-number))))) -(defun gnus-tree-goto-article (article) - (let ((pos (text-property-any - (point-min) (point-max) 'gnus-number article))) - (when pos - (goto-char pos)))) - (defun gnus-tree-recenter () "Center point in the tree window." (let ((selected (selected-window)) === modified file 'lisp/gnus/gnus-score.el' --- lisp/gnus/gnus-score.el 2012-02-28 08:17:21 +0000 +++ lisp/gnus/gnus-score.el 2012-07-24 22:17:17 +0000 @@ -947,25 +947,6 @@ (gnus-summary-raise-score score)))) (beginning-of-line 2)))) (gnus-set-mode-line 'summary)) - -(defun gnus-summary-score-crossposting (score date) - ;; Enter score file entry for current crossposting. - ;; SCORE is the score to add. - ;; DATE is the expire date. - (let ((xref (gnus-summary-header "xref")) - (start 0) - group) - (unless xref - (error "This article is not crossposted")) - (while (string-match " \\([^ \t]+\\):" xref start) - (setq start (match-end 0)) - (when (not (string= - (setq group - (substring xref (match-beginning 1) (match-end 1))) - gnus-newsgroup-name)) - (gnus-summary-score-entry - "xref" (concat " " group ":") nil score date t))))) - ;;; ;;; Gnus Score Files @@ -3056,62 +3037,6 @@ ;; Return whether this score file needs to be saved. By Je-haysuss! updated)) -(defun gnus-score-regexp-bad-p (regexp) - "Test whether REGEXP is safe for Gnus scoring. -A regexp is unsafe if it matches newline or a buffer boundary. - -If the regexp is good, return nil. If the regexp is bad, return a -cons cell (SYM . STRING), where the symbol SYM is `new' or `bad'. -In the `new' case, the string is a safe replacement for REGEXP. -In the `bad' case, the string is a unsafe subexpression of REGEXP, -and we do not have a simple replacement to suggest. - -See Info node `(gnus)Scoring Tips' for examples of good regular expressions." - (let (case-fold-search) - (and - ;; First, try a relatively fast necessary condition. - ;; Notice ranges (like [^:] or [\t-\r]), \s>, \Sw, \W, \', \`: - (string-match "\n\\|\\\\[SsW`']\\|\\[\\^\\|[\0-\n]-" regexp) - ;; Now break the regexp into tokens, and check each: - (let ((tail regexp) ; remaining regexp to check - tok ; current token - bad ; nil, or bad subexpression - new ; nil, or replacement regexp so far - end) ; length of current token - (while (and (not bad) - (string-match - "\\`\\(\\\\[sS]?.\\|\\[\\^?]?[^]]*]\\|[^\\]\\)" - tail)) - (setq end (match-end 0) - tok (substring tail 0 end) - tail (substring tail end)) - (if;; Is token `bad' (matching newline or buffer ends)? - (or (member tok '("\n" "\\W" "\\`" "\\'")) - ;; This next handles "[...]", "\\s.", and "\\S.": - (and (> end 2) (string-match tok "\n"))) - (let ((newtok - ;; Try to suggest a replacement for tok ... - (cond ((string-equal tok "\\`") "^") ; or "\\(^\\)" - ((string-equal tok "\\'") "$") ; or "\\($\\)" - ((string-match "\\[\\^" tok) ; very common - (concat (substring tok 0 -1) "\n]"))))) - (if newtok - (setq new - (concat - (or new - ;; good prefix so far: - (substring regexp 0 (- (+ (length tail) end)))) - newtok)) - ;; No replacement idea, so give up: - (setq bad tok))) - ;; tok is good, may need to extend new - (and new (setq new (concat new tok))))) - ;; Now return a value: - (cond - (bad (cons 'bad bad)) - (new (cons 'new new)) - (t nil)))))) - (provide 'gnus-score) ;;; gnus-score.el ends here === modified file 'lisp/gnus/gnus-start.el' --- lisp/gnus/gnus-start.el 2012-06-26 22:52:31 +0000 +++ lisp/gnus/gnus-start.el 2012-07-24 22:17:17 +0000 @@ -1369,11 +1369,6 @@ (funcall gnus-group-change-level-function group level oldlevel previous))))) -(defun gnus-kill-newsgroup (newsgroup) - "Obsolete function. Kills a newsgroup." - (gnus-group-change-level - (gnus-group-entry newsgroup) gnus-level-killed)) - (defun gnus-check-bogus-newsgroups (&optional confirm) "Remove bogus newsgroups. If CONFIRM is non-nil, the user has to confirm the deletion of every === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2012-07-09 22:12:19 +0000 +++ lisp/gnus/gnus-sum.el 2012-07-24 22:17:17 +0000 @@ -2967,12 +2967,6 @@ (setq gnus-summary-tool-bar-map map)))) (set (make-local-variable 'tool-bar-map) gnus-summary-tool-bar-map)) -(defun gnus-score-set-default (var value) - "A version of set that updates the GNU Emacs menu-bar." - (set var value) - ;; It is the message that forces the active status to be updated. - (message "")) - (defun gnus-make-score-map (type) "Make a summary score map of type TYPE." (if t @@ -3258,13 +3252,6 @@ "Say whether this article is a sparse article or not." `(memq ,article gnus-newsgroup-ancient)) -(defun gnus-article-parent-p (number) - "Say whether this article is a parent or not." - (let ((data (gnus-data-find-list number))) - (and (cdr data) ; There has to be an article after... - (< (gnus-data-level (car data)) ; And it has to have a higher level. - (gnus-data-level (nth 1 data)))))) - (defun gnus-article-children (number) "Return a list of all children to NUMBER." (let* ((data (gnus-data-find-list number)) @@ -3286,14 +3273,6 @@ "Say whether this article is intangible or not." '(get-text-property (point) 'gnus-intangible)) -(defun gnus-article-read-p (article) - "Say whether ARTICLE is read or not." - (not (or (memq article gnus-newsgroup-marked) - (memq article gnus-newsgroup-spam-marked) - (memq article gnus-newsgroup-unreads) - (memq article gnus-newsgroup-unselected) - (memq article gnus-newsgroup-dormant)))) - ;; Some summary mode macros. (defmacro gnus-summary-article-number () @@ -5925,17 +5904,6 @@ (setq articles (cdr articles))) out)) -(defun gnus-uncompress-marks (marks) - "Uncompress the mark ranges in MARKS." - (let ((uncompressed '(score bookmark)) - out) - (while marks - (if (memq (caar marks) uncompressed) - (push (car marks) out) - (push (cons (caar marks) (gnus-uncompress-range (cdar marks))) out)) - (setq marks (cdr marks))) - out)) - (defun gnus-article-mark-to-type (mark) "Return the type of MARK." (or (cadr (assq mark gnus-article-special-mark-lists)) @@ -7754,10 +7722,6 @@ gnus-buttonized-mime-types))) (gnus-summary-select-article nil 'force))) -(defun gnus-summary-set-current-mark (&optional current-mark) - "Obsolete function." - nil) - (defun gnus-summary-next-article (&optional unread subject backward push) "Select the next article. If UNREAD, only unread articles are selected. === modified file 'lisp/gnus/gnus-topic.el' --- lisp/gnus/gnus-topic.el 2012-01-19 07:21:25 +0000 +++ lisp/gnus/gnus-topic.el 2012-07-24 22:17:17 +0000 @@ -145,13 +145,6 @@ (setq alist (cdr alist))) out)) -(defun gnus-group-parent-topic (group) - "Return the topic GROUP is member of by looking at the group buffer." - (with-current-buffer gnus-group-buffer - (if (gnus-group-goto-group group) - (gnus-current-topic) - (gnus-group-topic group)))) - (defun gnus-topic-goto-topic (topic) (when topic (gnus-goto-char (text-property-any (point-min) (point-max) === modified file 'lisp/gnus/gnus-util.el' --- lisp/gnus/gnus-util.el 2012-06-26 22:52:31 +0000 +++ lisp/gnus/gnus-util.el 2012-07-24 22:17:17 +0000 @@ -207,16 +207,6 @@ (match-end 0))))) (list (if (string= name "") nil name) (or address from)))) -(defun gnus-extract-address-component-name (from) - "Extract name from a From header. -Uses `gnus-extract-address-components'." - (nth 0 (gnus-extract-address-components from))) - -(defun gnus-extract-address-component-email (from) - "Extract e-mail address from a From header. -Uses `gnus-extract-address-components'." - (nth 1 (gnus-extract-address-components from))) - (declare-function message-fetch-field "message" (header &optional not-all)) (defun gnus-fetch-field (field) @@ -655,10 +645,6 @@ ;; should be gnus-characterp, but this can't be called in XEmacs anyway (cons (and (numberp event) event) event))) -(defun gnus-sortable-date (date) - "Make string suitable for sorting from DATE." - (gnus-time-iso8601 (date-to-time date))) - (defun gnus-copy-file (file &optional to) "Copy FILE to TO." (interactive @@ -843,28 +829,6 @@ (unless dir (delete-directory directory))))) -;; The following two functions are used in gnus-registry. -;; They were contributed by Andreas Fuchs . -(defun gnus-alist-to-hashtable (alist) - "Build a hashtable from the values in ALIST." - (let ((ht (make-hash-table - :size 4096 - :test 'equal))) - (mapc - (lambda (kv-pair) - (puthash (car kv-pair) (cdr kv-pair) ht)) - alist) - ht)) - -(defun gnus-hashtable-to-alist (hash) - "Build an alist from the values in HASH." - (let ((list nil)) - (maphash - (lambda (key value) - (setq list (cons (cons key value) list))) - hash) - list)) - (defun gnus-strip-whitespace (string) "Return STRING stripped of all whitespace." (while (string-match "[\r\n\t ]+" string) @@ -1241,13 +1205,6 @@ (with-current-buffer gnus-group-buffer (eq major-mode 'gnus-group-mode)))) -(defun gnus-process-live-p (process) - "Returns non-nil if PROCESS is alive. -A process is considered alive if its status is `run', `open', -`listen', `connect' or `stop'." - (memq (process-status process) - '(run open listen connect stop))) - (defun gnus-remove-if (predicate sequence &optional hash-table-p) "Return a copy of SEQUENCE with all items satisfying PREDICATE removed. SEQUENCE should be a list, a vector, or a string. Returns always a list. === modified file 'lisp/gnus/gnus-uu.el' --- lisp/gnus/gnus-uu.el 2012-01-19 07:21:25 +0000 +++ lisp/gnus/gnus-uu.el 2012-07-24 22:17:17 +0000 @@ -1615,16 +1615,6 @@ gnus-shell-command-separator " sh"))))) state)) -;; Returns the name of what the shar file is going to unpack. -(defun gnus-uu-find-name-in-shar () - (let ((oldpoint (point)) - res) - (goto-char (point-min)) - (when (re-search-forward gnus-uu-shar-name-marker nil t) - (setq res (buffer-substring (match-beginning 1) (match-end 1)))) - (goto-char oldpoint) - res)) - ;; `gnus-uu-choose-action' chooses what action to perform given the name ;; and `gnus-uu-file-action-list'. Returns either nil if no action is ;; found, or the name of the command to run if such a rule is found. === modified file 'lisp/gnus/gnus.el' --- lisp/gnus/gnus.el 2012-06-26 22:52:31 +0000 +++ lisp/gnus/gnus.el 2012-07-24 22:17:17 +0000 @@ -3412,15 +3412,6 @@ (t ;Has positive number (eq (gnus-request-type group article) 'news)))) ;use it. -;; Returns a list of writable groups. -(defun gnus-writable-groups () - (let ((alist gnus-newsrc-alist) - groups group) - (while (setq group (car (pop alist))) - (unless (gnus-group-read-only-p group) - (push group groups))) - (nreverse groups))) - ;; Check whether to use long file names. (defun gnus-use-long-file-name (symbol) ;; The variable has to be set... @@ -3696,21 +3687,10 @@ group (concat (gnus-method-to-server-name method) ":" group))) -(defun gnus-group-guess-prefixed-name (group) - "Guess the whole name from GROUP and METHOD." - (gnus-group-prefixed-name group (gnus-find-method-for-group - group))) - (defun gnus-group-full-name (group method) "Return the full name from GROUP and METHOD, even if the method is native." (gnus-group-prefixed-name group method t)) -(defun gnus-group-guess-full-name (group) - "Guess the full name from GROUP, even if the method is native." - (if (gnus-group-prefixed-p group) - group - (gnus-group-full-name group (gnus-find-method-for-group group)))) - (defun gnus-group-guess-full-name-from-command-method (group) "Guess the full name from GROUP, even if the method is native." (if (gnus-group-prefixed-p group) === modified file 'lisp/gnus/mail-source.el' --- lisp/gnus/mail-source.el 2012-01-19 07:21:25 +0000 +++ lisp/gnus/mail-source.el 2012-07-24 22:17:17 +0000 @@ -721,12 +721,6 @@ ;; Return whether we moved successfully or not. to))) -(defun mail-source-movemail-and-remove (from to) - "Move FROM to TO using movemail, then remove FROM if empty." - (or (not (mail-source-movemail from to)) - (not (zerop (nth 7 (file-attributes from)))) - (delete-file from))) - (defun mail-source-fetch-with-program (program) (eq 0 (call-process shell-file-name nil nil nil shell-command-switch program))) === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2012-07-21 11:05:32 +0000 +++ lisp/gnus/message.el 2012-07-24 22:17:17 +0000 @@ -4011,28 +4011,6 @@ (forward-char -1) nil)))) -(defun message-remove-signature () - "Remove the signature from the text between point and mark. -The text will also be indented the normal way." - (save-excursion - (let ((start (point)) - mark) - (if (not (re-search-forward message-signature-separator (mark t) t)) - ;; No signature here, so we just indent the cited text. - (message-indent-citation) - ;; Find the last non-empty line. - (forward-line -1) - (while (looking-at "[ \t]*$") - (forward-line -1)) - (forward-line 1) - (setq mark (set-marker (make-marker) (point))) - (goto-char start) - (message-indent-citation) - ;; Enable undoing the deletion. - (undo-boundary) - (delete-region mark (mark t)) - (set-marker mark nil))))) - ;;; @@ -5805,12 +5783,6 @@ (concat system-name ".i-did-not-set--mail-host-address--so-tickle-me"))))) -(defun message-make-host-name () - "Return the name of the host." - (let ((fqdn (message-make-fqdn))) - (string-match "^[^.]+\\." fqdn) - (substring fqdn 0 (1- (match-end 0))))) - (defun message-make-domain () "Return the domain name." (or mail-host-address @@ -6134,13 +6106,6 @@ (forward-char 1))) (skip-chars-forward " \t\n"))) -(defun message-fill-address (header value) - (insert (capitalize (symbol-name header)) - ": " - (if (consp value) (car value) value) - "\n") - (message-fill-field-address)) - (defun message-split-line () "Split current line, moving portion beyond point vertically down. If the current line has `message-yank-prefix', insert it on the new line." === modified file 'lisp/gnus/mm-url.el' --- lisp/gnus/mm-url.el 2012-01-19 07:21:25 +0000 +++ lisp/gnus/mm-url.el 2012-07-24 22:17:17 +0000 @@ -416,69 +416,6 @@ (autoload 'mml-compute-boundary "mml") -(defun mm-url-encode-multipart-form-data (pairs &optional boundary) - "Return PAIRS encoded in multipart/form-data." - ;; RFC1867 - - ;; Get a good boundary - (unless boundary - (setq boundary (mml-compute-boundary '()))) - - (concat - - ;; Start with the boundary - "--" boundary "\r\n" - - ;; Create name value pairs - (mapconcat - 'identity - ;; Delete any returned items that are empty - (delq nil - (mapcar (lambda (data) - (when (car data) - ;; For each pair - (concat - - ;; Encode the name - "Content-Disposition: form-data; name=\"" - (car data) "\"\r\n" - "Content-Type: text/plain; charset=utf-8\r\n" - "Content-Transfer-Encoding: binary\r\n\r\n" - - (cond ((stringp (cdr data)) - (cdr data)) - ((integerp (cdr data)) - (int-to-string (cdr data)))) - - "\r\n"))) - pairs)) - ;; use the boundary as a separator - (concat "--" boundary "\r\n")) - - ;; put a boundary at the end. - "--" boundary "--\r\n")) - -(defun mm-url-fetch-form (url pairs) - "Fetch a form from URL with PAIRS as the data using the POST method." - (mm-url-load-url) - (let ((url-request-data (mm-url-encode-www-form-urlencoded pairs)) - (url-request-method "POST") - (url-request-extra-headers - '(("Content-type" . "application/x-www-form-urlencoded")))) - (url-insert-file-contents url) - (setq buffer-file-name nil)) - t) - -(defun mm-url-fetch-simple (url content) - (mm-url-load-url) - (let ((url-request-data content) - (url-request-method "POST") - (url-request-extra-headers - '(("Content-type" . "application/x-www-form-urlencoded")))) - (url-insert-file-contents url) - (setq buffer-file-name nil)) - t) - (defun mm-url-remove-markup () "Remove all HTML markup, leaving just plain text." (goto-char (point-min)) === modified file 'lisp/gnus/mm-view.el' --- lisp/gnus/mm-view.el 2012-01-29 00:28:05 +0000 +++ lisp/gnus/mm-view.el 2012-07-24 22:17:17 +0000 @@ -496,9 +496,6 @@ (defun mm-inline-audio (handle) (message "Not implemented")) -(defun mm-view-sound-file () - (message "Not implemented")) - (defun mm-w3-prepare-buffer () (require 'w3) (let ((url-standalone-mode t) === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2012-06-26 22:52:31 +0000 +++ lisp/gnus/nnimap.el 2012-07-24 22:17:17 +0000 @@ -1852,15 +1852,6 @@ (forward-line 1))) (buffer-substring (point) end)))) -(defun nnimap-get-responses (sequences) - (let (responses) - (dolist (sequence sequences) - (goto-char (point-min)) - (when (re-search-forward (format "^%d " sequence) nil t) - (push (list sequence (nnimap-parse-response)) - responses))) - responses)) - (defvar nnimap-incoming-split-list nil) (defun nnimap-fetch-inbox (articles) === modified file 'lisp/gnus/nntp.el' --- lisp/gnus/nntp.el 2012-06-26 22:52:31 +0000 +++ lisp/gnus/nntp.el 2012-07-24 22:17:17 +0000 @@ -1230,30 +1230,6 @@ (read-passwd (format "NNTP (%s@%s) password: " user nntp-address)))))))))) -(defun nntp-send-nosy-authinfo () - "Send the AUTHINFO to the nntp server." - (let ((user (read-string (format "NNTP (%s) user name: " nntp-address)))) - (unless (member user '(nil "")) - (nntp-send-command "^3.*\r?\n" "AUTHINFO USER" user) - (when t ;???Should check if AUTHINFO succeeded - (nntp-send-command "^2.*\r?\n" "AUTHINFO PASS" - (read-passwd (format "NNTP (%s@%s) password: " - user nntp-address))))))) - -(defun nntp-send-authinfo-from-file () - "Send the AUTHINFO to the nntp server. - -The authinfo login name is taken from the user's login name and the -password contained in '~/.nntp-authinfo'." - (when (file-exists-p "~/.nntp-authinfo") - (with-temp-buffer - (insert-file-contents "~/.nntp-authinfo") - (goto-char (point-min)) - (nntp-send-command "^3.*\r?\n" "AUTHINFO USER" (user-login-name)) - (nntp-send-command - "^2.*\r?\n" "AUTHINFO PASS" - (buffer-substring (point) (point-at-eol)))))) - ;;; Internal functions. (defun nntp-handle-authinfo (process) @@ -1380,14 +1356,6 @@ nntp-process-start-point (point-max)) (setq after-change-functions '(nntp-after-change-function)))) -(defun nntp-async-timer-handler () - (mapcar - (lambda (proc) - (if (memq (process-status proc) '(open run)) - (nntp-async-trigger proc) - (nntp-async-stop proc))) - nntp-async-process-list)) - (defun nntp-async-stop (proc) (setq nntp-async-process-list (delq proc nntp-async-process-list)) (when (and nntp-async-timer (not nntp-async-process-list)) === modified file 'lisp/net/netrc.el' --- lisp/net/netrc.el 2012-02-11 22:13:29 +0000 +++ lisp/net/netrc.el 2012-07-24 22:17:17 +0000 @@ -215,26 +215,6 @@ (eq type (car (cddr service))))))) (car service))) -(defun netrc-find-service-number (name &optional type) - (let ((services (netrc-parse-services)) - service) - (setq type (or type 'tcp)) - (while (and (setq service (pop services)) - (not (and (string= name (car service)) - (eq type (car (cddr service))))))) - (cadr service))) - -(defun netrc-store-data (file host port user password) - (with-temp-buffer - (when (file-exists-p file) - (insert-file-contents file)) - (goto-char (point-max)) - (unless (bolp) - (insert "\n")) - (insert (format "machine %s login %s password %s port %s\n" - host user password port)) - (write-region (point-min) (point-max) file nil 'silent))) - ;;;###autoload (defun netrc-credentials (machine &rest ports) "Return a user name/password pair. ------------------------------------------------------------ revno: 109197 fixes bug(s): http://debbugs.gnu.org/11832 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2012-07-24 19:34:15 +0300 message: Fix display of tooltips damaged by enhancements for bug #11832. src/xdisp.c (init_iterator): Don't compute dimensions of truncation and continuation glyphs on tooltip frames, leave them at zero. Avoids displaying continued lines in tooltips. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-24 06:45:44 +0000 +++ src/ChangeLog 2012-07-24 16:34:15 +0000 @@ -1,3 +1,9 @@ +2012-07-24 Eli Zaretskii + + * xdisp.c (init_iterator): Don't compute dimensions of truncation + and continuation glyphs on tooltip frames, leave them at zero. + Avoids continued lines in tooltips. (Bug#11832) + 2012-07-24 Dmitry Antipov Simplify copy_overlay. === modified file 'src/xdisp.c' --- src/xdisp.c 2012-07-13 10:11:37 +0000 +++ src/xdisp.c 2012-07-24 16:34:15 +0000 @@ -2733,20 +2733,25 @@ /* Get dimensions of truncation and continuation glyphs. These are displayed as fringe bitmaps under X, but we need them for such - frames when the fringes are turned off. */ - if (it->line_wrap == TRUNCATE) - { - /* We will need the truncation glyph. */ - eassert (it->glyph_row == NULL); - produce_special_glyphs (it, IT_TRUNCATION); - it->truncation_pixel_width = it->pixel_width; - } - else - { - /* We will need the continuation glyph. */ - eassert (it->glyph_row == NULL); - produce_special_glyphs (it, IT_CONTINUATION); - it->continuation_pixel_width = it->pixel_width; + frames when the fringes are turned off. But leave the dimensions + zero for tooltip frames, as these glyphs look ugly there and also + sabotage calculations of tooltip dimensions in x-show-tip. */ + if (!(FRAMEP (tip_frame) && it->f == XFRAME (tip_frame))) + { + if (it->line_wrap == TRUNCATE) + { + /* We will need the truncation glyph. */ + eassert (it->glyph_row == NULL); + produce_special_glyphs (it, IT_TRUNCATION); + it->truncation_pixel_width = it->pixel_width; + } + else + { + /* We will need the continuation glyph. */ + eassert (it->glyph_row == NULL); + produce_special_glyphs (it, IT_CONTINUATION); + it->continuation_pixel_width = it->pixel_width; + } } /* Reset these values to zero because the produce_special_glyphs ------------------------------------------------------------ revno: 109196 committer: Dmitry Antipov branch nick: trunk timestamp: Tue 2012-07-24 10:45:44 +0400 message: Simplify copy_overlay. * buffer.c (copy_overlay): Simplify, use build_marker. * lisp.h (struct Lisp_Overlay): Restore comment with minor tweaks. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-07-23 16:57:20 +0000 +++ src/ChangeLog 2012-07-24 06:45:44 +0000 @@ -1,3 +1,9 @@ +2012-07-24 Dmitry Antipov + + Simplify copy_overlay. + * buffer.c (copy_overlay): Simplify, use build_marker. + * lisp.h (struct Lisp_Overlay): Restore comment with minor tweaks. + 2012-07-23 Eli Zaretskii * print.c (print_object): Don't crash when a frame's name is nil === modified file 'src/buffer.c' --- src/buffer.c 2012-07-23 11:15:43 +0000 +++ src/buffer.c 2012-07-24 06:45:44 +0000 @@ -410,32 +410,24 @@ static struct Lisp_Overlay * copy_overlays (struct buffer *b, struct Lisp_Overlay *list) { - Lisp_Object buffer; struct Lisp_Overlay *result = NULL, *tail = NULL; - XSETBUFFER (buffer, b); - for (; list; list = list->next) { - Lisp_Object overlay, start, end, old_overlay; - ptrdiff_t charpos; - - XSETMISC (old_overlay, list); - charpos = marker_position (OVERLAY_START (old_overlay)); - start = Fmake_marker (); - Fset_marker (start, make_number (charpos), buffer); - XMARKER (start)->insertion_type - = XMARKER (OVERLAY_START (old_overlay))->insertion_type; - - charpos = marker_position (OVERLAY_END (old_overlay)); - end = Fmake_marker (); - Fset_marker (end, make_number (charpos), buffer); - XMARKER (end)->insertion_type - = XMARKER (OVERLAY_END (old_overlay))->insertion_type; - - overlay = build_overlay - (start, end, Fcopy_sequence (OVERLAY_PLIST (old_overlay))); - + Lisp_Object overlay, start, end; + struct Lisp_Marker *m; + + eassert (MARKERP (list->start)); + m = XMARKER (list->start); + start = build_marker (b, m->charpos, m->bytepos); + XMARKER (start)->insertion_type = m->insertion_type; + + eassert (MARKERP (list->end)); + m = XMARKER (list->end); + end = build_marker (b, m->charpos, m->bytepos); + XMARKER (end)->insertion_type = m->insertion_type; + + overlay = build_overlay (start, end, Fcopy_sequence (list->plist)); if (tail) tail = tail->next = XOVERLAY (overlay); else === modified file 'src/lisp.h' --- src/lisp.h 2012-07-23 11:15:43 +0000 +++ src/lisp.h 2012-07-24 06:45:44 +0000 @@ -1286,6 +1286,17 @@ /* START and END are markers in the overlay's buffer, and PLIST is the overlay's property list. */ struct Lisp_Overlay +/* An overlay's real data content is: + - plist + - buffer (really there are two buffer pointers, one per marker, + and both points to the same buffer) + - insertion type of both ends (per-marker fields) + - start & start byte (of start marker) + - end & end byte (of end marker) + - next (singly linked list of overlays) + - next fields of start and end markers (singly linked list of markers). + I.e. 9words plus 2 bits, 3words of which are for external linked lists. +*/ { ENUM_BF (Lisp_Misc_Type) type : 16; /* = Lisp_Misc_Overlay */ unsigned gcmarkbit : 1;