Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 102235. ------------------------------------------------------------ revno: 102235 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-11-02 20:53:12 -0700 message: * doc/misc/gnus.texi (Configuring nnmairix): Spelling fix. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-11-03 03:49:04 +0000 +++ doc/misc/ChangeLog 2010-11-03 03:53:12 +0000 @@ -1,7 +1,7 @@ 2010-11-03 Glenn Morris * ediff.texi (Quick Help Commands, Miscellaneous): - * gnus.texi (Agent Variables): Spelling fix. + * gnus.texi (Agent Variables, Configuring nnmairix): Spelling fix. 2010-10-31 Lars Magne Ingebrigtsen === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2010-11-03 03:40:54 +0000 +++ doc/misc/gnus.texi 2010-11-03 03:53:12 +0000 @@ -4556,7 +4556,7 @@ server exclusively for @code{nnmairix} in your secondary select methods (@pxref{Finding the News}). If you use a secondary @code{nnml} server just for mairix, make sure that you explicitly set the server variable -@code{nnml-get-new-mail} to @code{nil}, or you might loose mail +@code{nnml-get-new-mail} to @code{nil}, or you might lose mail (@pxref{nnmairix caveats}). If you want to use mairix remotely on an @acronym{IMAP} server, you have to choose the corresponding @code{nnimap} server here. ------------------------------------------------------------ revno: 102234 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-11-02 20:49:04 -0700 message: Don't be so lax with spelling. * lisp/net/dbus.el (dbus-name-owner-changed-handler): Doc fix. * doc/misc/ediff.texi (Quick Help Commands, Miscellaneous): Spelling fix. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-11-03 03:40:54 +0000 +++ doc/misc/ChangeLog 2010-11-03 03:49:04 +0000 @@ -1,5 +1,6 @@ 2010-11-03 Glenn Morris + * ediff.texi (Quick Help Commands, Miscellaneous): * gnus.texi (Agent Variables): Spelling fix. 2010-10-31 Lars Magne Ingebrigtsen === modified file 'doc/misc/ediff.texi' --- doc/misc/ediff.texi 2010-09-13 14:42:33 +0000 +++ doc/misc/ediff.texi 2010-11-03 03:49:04 +0000 @@ -759,7 +759,7 @@ You can then restart any of these sessions by either clicking on a session record or by putting the cursor over it and then typing the return key. -(Some poor souls leave so many active Ediff sessions around that they loose +(Some poor souls leave so many active Ediff sessions around that they lose track of them completely... The `R' command is designed to save these people from the recently discovered Ediff Proficiency Syndrome.) @@ -2315,7 +2315,7 @@ However, Ediff temporarily resets this variable to @code{t} if it is invoked via one of the "buffer" jobs, such as @code{ediff-buffers}. -This is because it is all too easy to loose day's work otherwise. +This is because it is all too easy to lose a day's work otherwise. Besides, in a "buffer" job, the variant buffers have already been loaded prior to starting Ediff, so Ediff just preserves status quo here. @@ -2542,6 +2542,3 @@ @bye -@ignore - arch-tag: 165ecb88-d03c-44b1-a921-b93f50b05b46 -@end ignore === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-03 03:35:38 +0000 +++ lisp/ChangeLog 2010-11-03 03:49:04 +0000 @@ -1,5 +1,7 @@ 2010-11-03 Glenn Morris + * net/dbus.el (dbus-name-owner-changed-handler): Doc fix. + * play/landmark.el (lm-losing-threshold): Correct spelling. (lm-human-plays): Use new name. === modified file 'lisp/emacs-lisp/checkdoc.el' --- lisp/emacs-lisp/checkdoc.el 2010-10-02 02:46:13 +0000 +++ lisp/emacs-lisp/checkdoc.el 2010-11-03 03:49:04 +0000 @@ -1388,7 +1388,7 @@ regexp short cuts work. FP is the function defun information." (let ((case-fold-search nil) ;; Use a marker so if an early check modifies the text, - ;; we won't accidentally loose our place. This could cause + ;; we won't accidentally lose our place. This could cause ;; end-of doc string whitespace to also delete the " char. (s (point)) (e (if (looking-at "\"") @@ -2676,5 +2676,4 @@ (provide 'checkdoc) -;; arch-tag: c49a7ec8-3bb7-46f2-bfbc-d5f26e033b26 ;;; checkdoc.el ends here === modified file 'lisp/mh-e/ChangeLog.1' --- lisp/mh-e/ChangeLog.1 2010-10-14 14:32:27 +0000 +++ lisp/mh-e/ChangeLog.1 2010-11-03 03:49:04 +0000 @@ -5452,7 +5452,7 @@ from mh-exec-cmd. * mh-utils.el (mh-temp-folders-buffer): Sequences and folders - loose the -temp from their buffer names as they are interesting to + lose the -temp from their buffer names as they are interesting to the user. * mh-seq.el (mh-list-sequences): New name, mh-sequences-buffer as @@ -11400,7 +11400,8 @@ (dist): Leave release in current directory. - Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -11417,4 +11418,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . -;; arch-tag: 2577172b-b1bf-4d87-acfb-c9d8780e8851 === modified file 'lisp/net/dbus.el' --- lisp/net/dbus.el 2010-08-30 13:03:05 +0000 +++ lisp/net/dbus.el 2010-11-03 03:49:04 +0000 @@ -239,7 +239,7 @@ arrived. SERVICE is the object name for which the name owner has been changed. OLD-OWNER is the previous owner of SERVICE, or the empty string if SERVICE was not owned yet. NEW-OWNER is the new -owner of SERVICE, or the empty string if SERVICE looses any name owner. +owner of SERVICE, or the empty string if SERVICE loses any name owner. usage: (dbus-name-owner-changed-handler service old-owner new-owner)" (save-match-data @@ -1010,5 +1010,4 @@ (provide 'dbus) -;; arch-tag: a47caf84-9162-4811-90cc-5d388e37b9bd ;;; dbus.el ends here === modified file 'lisp/textmodes/reftex-index.el' --- lisp/textmodes/reftex-index.el 2010-08-29 16:17:13 +0000 +++ lisp/textmodes/reftex-index.el 2010-11-03 03:49:04 +0000 @@ -1699,7 +1699,7 @@ (let* ((lines (split-string (buffer-substring beg end) "\n")) (lines1 (sort lines 'reftex-compare-phrase-lines))) (message "Sorting lines...done") - (let ((inhibit-quit t)) ;; make sure we do not loose lines + (let ((inhibit-quit t)) ;; make sure we do not lose lines (delete-region beg end) (insert (mapconcat 'identity lines1 "\n")))) (goto-char (point-max)) @@ -2104,5 +2104,4 @@ ["Save and Return" reftex-index-phrases-save-and-return t])) -;; arch-tag: 4b2362af-c156-42c1-8932-ea2823e205c1 ;;; reftex-index.el ends here === modified file 'lisp/textmodes/reftex-toc.el' --- lisp/textmodes/reftex-toc.el 2010-08-29 16:17:13 +0000 +++ lisp/textmodes/reftex-toc.el 2010-11-03 03:49:04 +0000 @@ -678,7 +678,7 @@ (error "Something is wrong! Contact maintainer!"))) ;; Section has changed, request scan and loading ;; We use a variable to delay until after the safe-exc. - ;; because otherwise we loose the region. + ;; because otherwise we lose the region. (setq load t))) ;; Scan document and load all files, this exits command (if load (reftex-toc-load-all-files-for-promotion))) ; exits @@ -1100,5 +1100,4 @@ ["Help" reftex-toc-show-help t])) -;; arch-tag: 92400ce2-0b86-4c89-a606-4ed71acea17e ;;; reftex-toc.el ends here === modified file 'lisp/vc/ediff-util.el' --- lisp/vc/ediff-util.el 2010-10-02 02:46:13 +0000 +++ lisp/vc/ediff-util.el 2010-11-03 03:49:04 +0000 @@ -311,7 +311,7 @@ ediff-word-mode-job (ediff-word-mode-job)) ;; Don't delete variants in case of ediff-buffer-* jobs without asking. - ;; This is because one may loose work---dangerous. + ;; This is because one may lose work---dangerous. (if (string-match "buffer" (symbol-name ediff-job-name)) (setq ediff-keep-variants t)) @@ -4289,5 +4289,4 @@ ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) ;; End: -;; arch-tag: f51099b6-ef4b-470f-88a1-3a0e0b03a879 ;;; ediff-util.el ends here === modified file 'lisp/x-dnd.el' --- lisp/x-dnd.el 2010-08-29 16:17:13 +0000 +++ lisp/x-dnd.el 2010-11-03 03:49:04 +0000 @@ -220,7 +220,7 @@ DATA is encoded in utf-16. Decode the URL and call `x-dnd-handle-uri-list'." ;; Mozilla and applications based on it (Galeon for example) uses ;; text/unicode, but it is impossible to tell if it is le or be. Use what - ;; the machine Emacs runs on use. This looses if dropping between machines + ;; the machine Emacs runs on use. This loses if dropping between machines ;; with different endian, but it is the best we can do. (let* ((coding (if (eq (byteorder) ?B) 'utf-16be 'utf-16le)) (string (decode-coding-string data coding)) @@ -766,5 +766,4 @@ (provide 'x-dnd) -;; arch-tag: b621fb7e-50da-4323-850b-5fc71ae64621 ;;; x-dnd.el ends here === modified file 'src/font.c' --- src/font.c 2010-10-14 14:32:27 +0000 +++ src/font.c 2010-11-03 03:49:04 +0000 @@ -1,8 +1,9 @@ /* font.c -- "Font" primitives. - Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. - Copyright (C) 2006, 2007, 2008, 2009, 2010 - National Institute of Advanced Industrial Science and Technology (AIST) - Registration Number H13PRO009 + +Copyright (C) 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. +Copyright (C) 2006, 2007, 2008, 2009, 2010 + National Institute of Advanced Industrial Science and Technology (AIST) + Registration Number H13PRO009 This file is part of GNU Emacs. @@ -3443,7 +3444,7 @@ if (NILP (entity)) return Qnil; } - /* Don't loose the original name that was put in initially. We need + /* Don't lose the original name that was put in initially. We need it to re-apply the font when font parameters (like hinting or dpi) have changed. */ entity = font_open_for_lface (f, entity, attrs, spec); @@ -3514,7 +3515,7 @@ args[1] = make_unibyte_string (name, strlen (name)); spec = Ffont_spec (2, args); ret = font_open_by_spec (f, spec); - /* Do not loose name originally put in. */ + /* Do not lose name originally put in. */ if (!NILP (ret)) font_put_extra (ret, QCuser_spec, args[1]); @@ -5399,5 +5400,3 @@ Vfont_log = egetenv ("EMACS_FONT_LOG") ? Qnil : Qt; } -/* arch-tag: 74c9475d-5976-4c93-a327-942ae3072846 - (do not change this comment) */ ------------------------------------------------------------ revno: 102233 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-11-02 20:40:54 -0700 message: Mere anarchy is loosed upon the world. * doc/misc/gnus.texi (Agent Variables): Spelling fix. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-10-31 22:31:24 +0000 +++ doc/misc/ChangeLog 2010-11-03 03:40:54 +0000 @@ -1,3 +1,7 @@ +2010-11-03 Glenn Morris + + * gnus.texi (Agent Variables): Spelling fix. + 2010-10-31 Lars Magne Ingebrigtsen * gnus.texi (Paging the Article): Document C-u g/C-u C-u g. === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2010-10-31 22:31:24 +0000 +++ doc/misc/gnus.texi 2010-11-03 03:40:54 +0000 @@ -19840,7 +19840,7 @@ performance. A small value minimizes the time lost should the connection be lost while fetching (You may need to run @code{gnus-agent-regenerate-group} to update the group's state. -However, all articles parsed prior to loosing the connection will be +However, all articles parsed prior to losing the connection will be available while unplugged). The default is 10M so it is unusual to see any cycling. === modified file 'lisp/emulation/viper-init.el' --- lisp/emulation/viper-init.el 2010-08-29 16:17:13 +0000 +++ lisp/emulation/viper-init.el 2010-11-03 03:40:54 +0000 @@ -784,7 +784,7 @@ ;; These two vars control the interaction of jumps performed by ' and `. ;; In this new version, '' doesn't erase the marks set by ``, so one can -;; use both kinds of jumps interchangeably and without loosing positions +;; use both kinds of jumps interchangeably and without losing positions ;; inside the lines. ;; Remembers position of the last jump done using ``'. === modified file 'lisp/gnus/ChangeLog.2' --- lisp/gnus/ChangeLog.2 2010-10-24 21:36:09 +0000 +++ lisp/gnus/ChangeLog.2 2010-11-03 03:40:54 +0000 @@ -16433,7 +16433,7 @@ 2001-01-09 Didier Verna * gnus-agent.el: Moved some XEmacs specific hook add-ons from - `gnus-xmas-[re]define' to avoid loosing user custom settings. + `gnus-xmas-[re]define' to avoid losing user custom settings. * gnus-art.el: Ditto. * gnus-group.el: Ditto. * gnus-salt.el: Ditto. === modified file 'src/buffer.h' --- src/buffer.h 2010-09-24 19:30:13 +0000 +++ src/buffer.h 2010-11-03 03:40:54 +0000 @@ -1,7 +1,8 @@ /* Header file for the buffer manipulation primitives. - Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, 2001, - 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 - Free Software Foundation, Inc. + +Copyright (C) 1985, 1986, 1993, 1994, 1995, 1997, 1998, 1999, 2000, + 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 + Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -459,7 +460,7 @@ struct Lisp_Marker *markers; /* Usually 0. Temporarily set to 1 in decode_coding_gap to - prevent Fgarbage_collect from shrinking the gap and loosing + prevent Fgarbage_collect from shrinking the gap and losing not-yet-decoded bytes. */ int inhibit_shrinking; }; @@ -1019,5 +1020,3 @@ #define PER_BUFFER_VALUE(BUFFER, OFFSET) \ (*(Lisp_Object *)((OFFSET) + (char *) (BUFFER))) -/* arch-tag: 679305dd-d41c-4a50-b170-3caf5c97b2d1 - (do not change this comment) */ ------------------------------------------------------------ revno: 102232 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-11-02 20:35:38 -0700 message: landmark: you lose. * lisp/play/landmark.el (lm-losing-threshold): Correct spelling. (lm-human-plays): Use new name. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-03 03:33:24 +0000 +++ lisp/ChangeLog 2010-11-03 03:35:38 +0000 @@ -1,5 +1,8 @@ 2010-11-03 Glenn Morris + * play/landmark.el (lm-losing-threshold): Correct spelling. + (lm-human-plays): Use new name. + * play/gomoku.el (gomoku-loosing-threshold): Correct spelling. (gomoku-human-plays): Use new name. === modified file 'lisp/play/landmark.el' --- lisp/play/landmark.el 2010-10-31 14:40:01 +0000 +++ lisp/play/landmark.el 2010-11-03 03:35:38 +0000 @@ -282,7 +282,7 @@ ;; its contents as a set, i.e. not considering the order of its elements. The ;; highest score is given to the "OOOO" qtuples because playing in such a ;; qtuple is winning the game. Just after this comes the "XXXX" qtuple because -;; not playing in it is just loosing the game, and so on. Note that a +;; not playing in it is just losing the game, and so on. Note that a ;; "polluted" qtuple, i.e. one containing at least one X and at least one O, ;; has score zero because there is no more any point in playing in it, from ;; both an attacking and a defending point of view. @@ -352,13 +352,13 @@ ;; qtuple, thus to be a winning move. Similarly, the only way for a square to ;; have a score between XXXXscore and OOOOscore is to belong to a "XXXX" ;; qtuple. We may use these considerations to detect when a given move is -;; winning or loosing. +;; winning or losing. (defconst lm-winning-threshold (aref lm-score-trans-table (+ 6 6 6 6)) ;; OOOOscore "Threshold score beyond which an Emacs move is winning.") -(defconst lm-loosing-threshold +(defconst lm-losing-threshold (aref lm-score-trans-table (+ 1 1 1 1)) ;; XXXXscore "Threshold score beyond which a human move is winning.") @@ -771,7 +771,7 @@ (t (setq score (aref lm-score-table square)) (lm-play-move square 1) - (cond ((and (>= score lm-loosing-threshold) + (cond ((and (>= score lm-losing-threshold) ;; Just testing SCORE > THRESHOLD is not enough for ;; detecting wins, it just gives an indication that ;; we confirm with LM-FIND-FILLED-QTUPLE. ------------------------------------------------------------ revno: 102231 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-11-02 20:33:24 -0700 message: Fix the most annoying typo in the world. * lisp/play/gomoku.el (gomoku-loosing-threshold): Correct spelling. (gomoku-human-plays): Use new name. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-03 03:30:37 +0000 +++ lisp/ChangeLog 2010-11-03 03:33:24 +0000 @@ -1,5 +1,8 @@ 2010-11-03 Glenn Morris + * play/gomoku.el (gomoku-loosing-threshold): Correct spelling. + (gomoku-human-plays): Use new name. + * play/gomoku.el (nil-score, Xscore, XXscore, XXXscore, XXXXscore) (Oscore, OOscore, OOOscore, OOOOscore): Rename with gomoku- prefix. (gomoku-score-trans-table, gomoku-winning-threshold) === modified file 'lisp/play/gomoku.el' --- lisp/play/gomoku.el 2010-11-03 03:30:37 +0000 +++ lisp/play/gomoku.el 2010-11-03 03:33:24 +0000 @@ -278,7 +278,7 @@ ;; its contents as a set, i.e. not considering the order of its elements. The ;; highest score is given to the "OOOO" qtuples because playing in such a ;; qtuple is winning the game. Just after this comes the "XXXX" qtuple because -;; not playing in it is just loosing the game, and so on. Note that a +;; not playing in it is just losing the game, and so on. Note that a ;; "polluted" qtuple, i.e. one containing at least one X and at least one O, ;; has score zero because there is no more any point in playing in it, from ;; both an attacking and a defending point of view. @@ -348,12 +348,12 @@ ;; qtuple, thus to be a winning move. Similarly, the only way for a square to ;; have a score between gomoku-XXXXscore and gomoku-OOOOscore is to belong to a "XXXX" ;; qtuple. We may use these considerations to detect when a given move is -;; winning or loosing. +;; winning or losing. (defconst gomoku-winning-threshold gomoku-OOOOscore "Threshold score beyond which an Emacs move is winning.") -(defconst gomoku-loosing-threshold gomoku-XXXXscore +(defconst gomoku-losing-threshold gomoku-XXXXscore "Threshold score beyond which a human move is winning.") @@ -872,7 +872,7 @@ (t (setq score (aref gomoku-score-table square)) (gomoku-play-move square 1) - (cond ((and (>= score gomoku-loosing-threshold) + (cond ((and (>= score gomoku-losing-threshold) ;; Just testing SCORE > THRESHOLD is not enough for ;; detecting wins, it just gives an indication that ;; we confirm with GOMOKU-FIND-FILLED-QTUPLE. ------------------------------------------------------------ revno: 102230 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-11-02 20:30:37 -0700 message: Silence compilation of gomoku.el. * lisp/play/gomoku.el (nil-score, Xscore, XXscore, XXXscore, XXXXscore) (Oscore, OOscore, OOOscore, OOOOscore): Rename with gomoku- prefix. (gomoku-score-trans-table, gomoku-winning-threshold) (gomoku-loosing-threshold, gomoku-init-score-table): Use new names. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-03 03:25:36 +0000 +++ lisp/ChangeLog 2010-11-03 03:30:37 +0000 @@ -1,3 +1,10 @@ +2010-11-03 Glenn Morris + + * play/gomoku.el (nil-score, Xscore, XXscore, XXXscore, XXXXscore) + (Oscore, OOscore, OOOscore, OOOOscore): Rename with gomoku- prefix. + (gomoku-score-trans-table, gomoku-winning-threshold) + (gomoku-loosing-threshold, gomoku-init-score-table): Use new names. + 2010-11-03 Chong Yidong * emacs-lisp/package.el: Don't put built-in packages in === modified file 'lisp/play/gomoku.el' --- lisp/play/gomoku.el 2010-10-31 14:40:01 +0000 +++ lisp/play/gomoku.el 2010-11-03 03:30:37 +0000 @@ -299,15 +299,15 @@ ;; these values will change (hopefully improve) the strength of the program ;; and may change its style (rather aggressive here). -(defconst nil-score 7 "Score of an empty qtuple.") -(defconst Xscore 15 "Score of a qtuple containing one X.") -(defconst XXscore 400 "Score of a qtuple containing two X's.") -(defconst XXXscore 1800 "Score of a qtuple containing three X's.") -(defconst XXXXscore 100000 "Score of a qtuple containing four X's.") -(defconst Oscore 35 "Score of a qtuple containing one O.") -(defconst OOscore 800 "Score of a qtuple containing two O's.") -(defconst OOOscore 15000 "Score of a qtuple containing three O's.") -(defconst OOOOscore 800000 "Score of a qtuple containing four O's.") +(defconst gomoku-nil-score 7 "Score of an empty qtuple.") +(defconst gomoku-Xscore 15 "Score of a qtuple containing one X.") +(defconst gomoku-XXscore 400 "Score of a qtuple containing two X's.") +(defconst gomoku-XXXscore 1800 "Score of a qtuple containing three X's.") +(defconst gomoku-XXXXscore 100000 "Score of a qtuple containing four X's.") +(defconst gomoku-Oscore 35 "Score of a qtuple containing one O.") +(defconst gomoku-OOscore 800 "Score of a qtuple containing two O's.") +(defconst gomoku-OOOscore 15000 "Score of a qtuple containing three O's.") +(defconst gomoku-OOOOscore 800000 "Score of a qtuple containing four O's.") ;; These values are not just random: if, given the following situation: ;; @@ -320,7 +320,7 @@ ;; you want Emacs to play in "a" and not in "b", then the parameters must ;; satisfy the inequality: ;; -;; 6 * XXscore > XXXscore + XXscore +;; 6 * gomoku-XXscore > gomoku-XXXscore + gomoku-XXscore ;; ;; because "a" mainly belongs to six "XX" qtuples (the others are less ;; important) while "b" belongs to one "XXX" and one "XX" qtuples. Other @@ -334,26 +334,26 @@ ;; we just have to set up a translation table. (defconst gomoku-score-trans-table - (vector nil-score Xscore XXscore XXXscore XXXXscore 0 - Oscore 0 0 0 0 0 - OOscore 0 0 0 0 0 - OOOscore 0 0 0 0 0 - OOOOscore 0 0 0 0 0 + (vector gomoku-nil-score gomoku-Xscore gomoku-XXscore gomoku-XXXscore gomoku-XXXXscore 0 + gomoku-Oscore 0 0 0 0 0 + gomoku-OOscore 0 0 0 0 0 + gomoku-OOOscore 0 0 0 0 0 + gomoku-OOOOscore 0 0 0 0 0 0) "Vector associating qtuple contents to their score.") ;; If you do not modify drastically the previous constants, the only way for a -;; square to have a score higher than OOOOscore is to belong to a "OOOO" +;; square to have a score higher than gomoku-OOOOscore is to belong to a "OOOO" ;; qtuple, thus to be a winning move. Similarly, the only way for a square to -;; have a score between XXXXscore and OOOOscore is to belong to a "XXXX" +;; have a score between gomoku-XXXXscore and gomoku-OOOOscore is to belong to a "XXXX" ;; qtuple. We may use these considerations to detect when a given move is ;; winning or loosing. -(defconst gomoku-winning-threshold OOOOscore +(defconst gomoku-winning-threshold gomoku-OOOOscore "Threshold score beyond which an Emacs move is winning.") -(defconst gomoku-loosing-threshold XXXXscore +(defconst gomoku-loosing-threshold gomoku-XXXXscore "Threshold score beyond which a human move is winning.") @@ -394,10 +394,10 @@ ;;; ;; At initialization the board is empty so that every qtuple amounts for -;; nil-score. Therefore, the score of any square is nil-score times the number +;; gomoku-nil-score. Therefore, the score of any square is gomoku-nil-score times the number ;; of qtuples that pass through it. This number is 3 in a corner and 20 if you ;; are sufficiently far from the sides. As computing the number is time -;; consuming, we initialize every square with 20*nil-score and then only +;; consuming, we initialize every square with 20*gomoku-nil-score and then only ;; consider squares at less than 5 squares from one side. We speed this up by ;; taking symmetry into account. ;; Also, as it is likely that successive games will be played on a board with @@ -421,7 +421,7 @@ (setq gomoku-score-table (copy-sequence gomoku-saved-score-table)) ;; No, compute it: (setq gomoku-score-table - (make-vector gomoku-vector-length (* 20 nil-score))) + (make-vector gomoku-vector-length (* 20 gomoku-nil-score))) (let (i j maxi maxj maxi2 maxj2) (setq maxi (/ (1+ gomoku-board-width) 2) maxj (/ (1+ gomoku-board-height) 2) ------------------------------------------------------------ revno: 102229 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-11-02 20:27:38 -0700 message: Silence compilation of mh-mime.el. * lisp/mh-e/mh-mime.el (dots, type, ov): Avoid unnecessary declaration. diff: === modified file 'lisp/mh-e/ChangeLog' --- lisp/mh-e/ChangeLog 2010-07-24 11:53:19 +0000 +++ lisp/mh-e/ChangeLog 2010-11-03 03:27:38 +0000 @@ -1,3 +1,7 @@ +2010-11-03 Glenn Morris + + * mh-mime.el (dots, type, ov): Avoid unnecessary declaration. + 2010-05-14 Peter S Galbraith * mh-mime.el (mh-decode-message-subject): New function to decode === modified file 'lisp/mh-e/mh-mime.el' --- lisp/mh-e/mh-mime.el 2010-05-19 12:23:40 +0000 +++ lisp/mh-e/mh-mime.el 2010-11-03 03:27:38 +0000 @@ -1,8 +1,7 @@ ;;; mh-mime.el --- MH-E MIME support -;; Copyright (C) 1993, 1995, -;; 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -;; Free Software Foundation, Inc. +;; Copyright (C) 1993, 1995, 2001, 2002, 2003, 2004, 2005, 2006, 2007, +;; 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Bill Wohler ;; Maintainer: Bill Wohler @@ -837,9 +836,10 @@ ;;; Button Display ;; Shush compiler. -(defvar dots) ; XEmacs -(defvar type) ; XEmacs -(defvar ov) ; XEmacs +(when (featurep 'xemacs) + (defvar dots) + (defvar type) + (defvar ov)) (defun mh-insert-mime-button (handle index displayed) "Insert MIME button for HANDLE. @@ -1834,5 +1834,4 @@ ;; sentence-end-double-space: nil ;; End: -;; arch-tag: 0dd36518-1b64-4a84-8f4e-59f422d3f002 ;;; mh-mime.el ends here ------------------------------------------------------------ revno: 102228 committer: Chong Yidong branch nick: trunk timestamp: Tue 2010-11-02 23:25:36 -0400 message: Separate built-in packages from elpa packages, for efficiency. * emacs-lisp/package.el: Don't put built-in packages in package-alist, to avoid loading inefficiencies. (package-built-in-p): Make VERSION optional, and treat it as a minimum acceptable version. (package-activate): Search separately for built-in packages. Emit a warning if a dependency fails. (define-package): Handle most common case, where there is no obsolete package, first. (package-compute-transaction): Print required version in error. (package--initialized): New variable. (list-packages): Use it. (package-initialize): Optional arg NO-ACTIVATE. Don't put built-in packages in packages-alist; keep it separate. Set package--initialized. (describe-package): Avoid activating packages as a side-effect. Search separately for built-in packages. (describe-package-1): Handle the case where an elpa package is simultaneously built-in and available/installed. (package-installed-p, package--generate-package-list): Search separately for built-in packages. (package-load-descriptor): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-03 02:30:12 +0000 +++ lisp/ChangeLog 2010-11-03 03:25:36 +0000 @@ -1,3 +1,27 @@ +2010-11-03 Chong Yidong + + * emacs-lisp/package.el: Don't put built-in packages in + package-alist, to avoid loading inefficiencies. + (package-built-in-p): Make VERSION optional, and treat it as a + minimum acceptable version. + (package-activate): Search separately for built-in packages. Emit + a warning if a dependency fails. + (define-package): Handle most common case, where there is no + obsolete package, first. + (package-compute-transaction): Print required version in error. + (package--initialized): New variable. + (list-packages): Use it. + (package-initialize): Optional arg NO-ACTIVATE. Don't put + built-in packages in packages-alist; keep it separate. Set + package--initialized. + (describe-package): Avoid activating packages as a side-effect. + Search separately for built-in packages. + (describe-package-1): Handle the case where an elpa package is + simultaneously built-in and available/installed. + (package-installed-p, package--generate-package-list): Search + separately for built-in packages. + (package-load-descriptor): Doc fix. + 2010-11-03 Stefan Monnier * progmodes/perl-mode.el (perl-syntax-propertize-function): === modified file 'lisp/emacs-lisp/package.el' --- lisp/emacs-lisp/package.el 2010-11-02 02:30:50 +0000 +++ lisp/emacs-lisp/package.el 2010-11-03 03:25:36 +0000 @@ -329,7 +329,9 @@ (match-string 1 dirname))) (defun package-load-descriptor (dir package) - "Load the description file in directory DIR for package PACKAGE." + "Load the description file in directory DIR for package PACKAGE. +Here, PACKAGE is a string of the form NAME-VER, where NAME is the +package name and VER is its version." (let* ((pkg-dir (expand-file-name package dir)) (pkg-file (expand-file-name (concat (package-strip-version package) "-pkg") @@ -419,42 +421,46 @@ ;; Don't return nil. t)) -(defun package--built-in (package version) - "Return true if the package is built-in to Emacs." +(defun package-built-in-p (package &optional version) + "Return true if PACKAGE, of VERSION or newer, is built-in to Emacs." + (require 'finder-inf nil t) ; For `package--builtins'. (let ((elt (assq package package--builtins))) - (and elt (version-list-= (package-desc-vers (cdr elt)) version)))) + (and elt (version-list-<= version (package-desc-vers (cdr elt)))))) -;; FIXME: return a reason instead? +;; This function goes ahead and activates a newer version of a package +;; if an older one was already activated. This is not ideal; we'd at +;; least need to check to see if the package has actually been loaded, +;; and not merely activated. (defun package-activate (package version) - "Activate a package, and recursively activate its dependencies. + "Activate package PACKAGE, of version VERSION or newer. +If PACKAGE has any dependencies, recursively activate them. Return nil if the package could not be activated." - ;; Assume the user knows what he is doing -- go ahead and activate a - ;; newer version of a package if an older one has already been - ;; activated. This is not ideal; we'd at least need to check to see - ;; if the package has actually been loaded, and not merely - ;; activated. However, don't try to activate 'emacs', as that makes - ;; no sense. - (unless (eq package 'emacs) - (let* ((pkg-desc (assq package package-alist)) - (this-version (package-desc-vers (cdr pkg-desc))) - (req-list (package-desc-reqs (cdr pkg-desc))) - ;; If the package was never activated, do it now. - (keep-going (or (not (memq package package-activated-list)) - (version-list-< version this-version)))) - (while (and req-list keep-going) - (let* ((req (car req-list)) - (req-name (car req)) - (req-version (cadr req))) - (or (package-activate req-name req-version) - (setq keep-going nil))) - (setq req-list (cdr req-list))) - (if keep-going - (package-activate-1 package (cdr pkg-desc)) - ;; We get here if a dependency failed to activate -- but we - ;; can also get here if the requested package was already - ;; activated. Return non-nil in the latter case. - (and (memq package package-activated-list) - (version-list-<= version this-version)))))) + (let ((pkg-vec (cdr (assq package package-alist))) + available-version found) + ;; Check if PACKAGE is available in `package-alist'. + (when pkg-vec + (setq available-version (package-desc-vers pkg-vec) + found (version-list-<= version available-version))) + (cond + ;; If no such package is found, maybe it's built-in. + ((null found) + (package-built-in-p package version)) + ;; If the package is already activated, just return t. + ((memq package package-activated-list) + t) + ;; Otherwise, proceed with activation. + (t + (let ((fail (catch 'dep-failure + ;; Activate its dependencies recursively. + (dolist (req (package-desc-reqs pkg-vec)) + (unless (package-activate (car req) (cadr req)) + (throw 'dep-failure req)))))) + (if fail + (warn "Unable to activate package `%s'. +Required package `%s', version %s, is unavailable" + package (car fail) (package-version-join (cadr fail))) + ;; If all goes well, activate the package itself. + (package-activate-1 package pkg-vec))))))) (defun package-mark-obsolete (package pkg-vec) "Put package on the obsolete list, if not already there." @@ -470,48 +476,45 @@ pkg-vec))) package-obsolete-alist)))) -(defun define-package (name-str version-string +(defun define-package (name-string version-string &optional docstring requirements &rest extra-properties) "Define a new package. -NAME is the name of the package, a string. -VERSION-STRING is the version of the package, a dotted sequence -of integers. -DOCSTRING is the optional description. -REQUIREMENTS is a list of requirements on other packages. +NAME-STRING is the name of the package, as a string. +VERSION-STRING is the version of the package, as a list of +integers of the form produced by `version-to-list'. +DOCSTRING is a short description of the package, a string. +REQUIREMENTS is a list of dependencies on other packages. Each requirement is of the form (OTHER-PACKAGE \"VERSION\"). EXTRA-PROPERTIES is currently unused." - (let* ((name (intern name-str)) - (pkg-desc (assq name package-alist)) - (new-version (version-to-list version-string)) + (let* ((name (intern name-string)) + (version (version-to-list version-string)) (new-pkg-desc (cons name - (vector new-version + (vector version (mapcar (lambda (elt) (list (car elt) (version-to-list (car (cdr elt))))) requirements) - docstring)))) - ;; Only redefine a package if the redefinition is newer. - (if (or (not pkg-desc) - (version-list-< (package-desc-vers (cdr pkg-desc)) - new-version)) - (progn - (when pkg-desc - ;; Remove old package and declare it obsolete. - (setq package-alist (delq pkg-desc package-alist)) - (package-mark-obsolete (car pkg-desc) (cdr pkg-desc))) - ;; Add package to the alist. - (push new-pkg-desc package-alist)) - ;; You can have two packages with the same version, for instance - ;; one in the system package directory and one in your private - ;; directory. We just let the first one win. - (unless (version-list-= new-version - (package-desc-vers (cdr pkg-desc))) - ;; The package is born obsolete. - (package-mark-obsolete (car new-pkg-desc) (cdr new-pkg-desc)))))) + docstring))) + (old-pkg (assq name package-alist))) + (cond + ;; If there's no old package, just add this to `package-alist'. + ((null old-pkg) + (push new-pkg-desc package-alist)) + ((version-list-< (package-desc-vers (cdr old-pkg)) version) + ;; Remove the old package and declare it obsolete. + (package-mark-obsolete name (cdr old-pkg)) + (setq package-alist (cons new-pkg-desc + (delq old-pkg package-alist)))) + ;; You can have two packages with the same version, e.g. one in + ;; the system package directory and one in your private + ;; directory. We just let the first one win. + ((not (version-list-= (package-desc-vers (cdr old-pkg)) version)) + ;; The package is born obsolete. + (package-mark-obsolete name (cdr new-pkg-desc)))))) ;; From Emacs 22. (defun package-autoload-ensure-default-file (file) @@ -657,10 +660,14 @@ (kill-buffer tar-buffer)))) (defun package-installed-p (package &optional min-version) + "Return true if PACKAGE, of VERSION or newer, is installed. +Built-in packages also qualify." (let ((pkg-desc (assq package package-alist))) - (and pkg-desc - (version-list-<= min-version - (package-desc-vers (cdr pkg-desc)))))) + (if pkg-desc + (version-list-<= min-version + (package-desc-vers (cdr pkg-desc))) + ;; Also check built-in packages. + (package-built-in-p package min-version)))) (defun package-compute-transaction (package-list requirements) "Return a list of packages to be installed, including PACKAGE-LIST. @@ -696,8 +703,9 @@ (symbol-name next-pkg) hold (package-version-join next-version))))) (unless pkg-desc - (error "Package '%s' is not available for installation" - (symbol-name next-pkg))) + (error "Package '%s', version %s, unavailable for installation" + (symbol-name next-pkg) + (package-version-join next-version))) (unless (version-list-<= next-version (package-desc-vers (cdr pkg-desc))) (error @@ -1014,24 +1022,21 @@ (car archive))))) (package-read-all-archive-contents)) +(defvar package--initialized nil) + ;;;###autoload -(defun package-initialize () +(defun package-initialize (&optional no-activate) "Load Emacs Lisp packages, and activate them. -The variable `package-load-list' controls which packages to load." +The variable `package-load-list' controls which packages to load. +If optional arg NO-ACTIVATE is non-nil, don't activate packages." (interactive) - (require 'finder-inf nil t) - (setq package-alist package--builtins - package-activated-list (mapcar #'car package-alist) - package-obsolete-alist nil) + (setq package-obsolete-alist nil) (package-load-all-descriptors) (package-read-all-archive-contents) - ;; "Deactivate" obsoleted built-in packages - (dolist (elt package-obsolete-alist) - (setq package-activated-list - (delq (car elt) package-activated-list))) - ;; Try to activate all our packages. - (dolist (elt package-alist) - (package-activate (car elt) (package-desc-vers (cdr elt))))) + (unless no-activate + (dolist (elt package-alist) + (package-activate (car elt) (package-desc-vers (cdr elt))))) + (setq package--initialized t)) ;;;; Package description buffer. @@ -1042,11 +1047,13 @@ (interactive (let* ((guess (function-called-at-point)) packages val) - ;; Initialize the package system if it's not. - (unless package-alist - (package-initialize)) + (require 'finder-inf nil t) + ;; Load the package list if necessary (but don't activate them). + (unless package--initialized + (package-initialize t)) (setq packages (append (mapcar 'car package-alist) - (mapcar 'car package-archive-contents))) + (mapcar 'car package-archive-contents) + (mapcar 'car package--builtins))) (unless (memq guess packages) (setq guess nil)) (setq packages (mapcar 'symbol-name packages)) @@ -1057,8 +1064,8 @@ "Describe package: ") packages nil t nil nil guess)) (list (if (equal val "") guess (intern val))))) - (if (or (null package) (null (symbolp package))) - (message "You did not specify a package") + (if (or (null package) (not (symbolp package))) + (message "No package specified") (help-setup-xref (list #'describe-package package) (called-interactively-p 'interactive)) (with-help-window (help-buffer) @@ -1072,22 +1079,27 @@ desc pkg-dir reqs version installable) (prin1 package) (princ " is ") - (if (setq desc (cdr (assq package package-alist))) - ;; This package is loaded (i.e. in `package-alist'). - (progn - (setq version (package-version-join (package-desc-vers desc))) - (cond ((setq pkg-dir (package--dir package-name version)) - (insert "an installed package.\n\n")) - (built-in - (princ "a built-in package.\n\n")) - (t ;; This normally does not happen. - (insert "a deleted package.\n\n") - (setq version nil)))) - ;; This package is not installed. - (setq desc (cdr (assq package package-archive-contents)) - version (package-version-join (package-desc-vers desc)) + (cond + ;; Loaded packages are in `package-alist'. + ((setq desc (cdr (assq package package-alist))) + (setq version (package-version-join (package-desc-vers desc))) + (if (setq pkg-dir (package--dir package-name version)) + (insert "an installed package.\n\n") + ;; This normally does not happen. + (insert "a deleted package.\n\n"))) + ;; Available packages are in `package-archive-contents'. + ((setq desc (cdr (assq package package-archive-contents))) + (setq version (package-version-join (package-desc-vers desc)) installable t) - (insert "an uninstalled package.\n\n")) + (if built-in + (insert "a built-in package.\n\n") + (insert "an uninstalled package.\n\n"))) + (built-in + (setq desc (cdr built-in) + version (package-version-join (package-desc-vers desc))) + (insert "a built-in package.\n\n")) + (t + (insert "an orphan package.\n\n"))) (insert " " (propertize "Status" 'font-lock-face 'bold) ": ") (cond (pkg-dir @@ -1097,32 +1109,35 @@ ;; Todo: Add button for uninstalling. (help-insert-xref-button (file-name-as-directory pkg-dir) 'help-package-def pkg-dir) - (insert "'.")) + (if built-in + (insert "',\n shadowing a " + (propertize "built-in package" + 'font-lock-face 'font-lock-builtin-face) + ".") + (insert "'."))) (installable - (insert "Available -- ") - (let ((button-text (if (display-graphic-p) - "Install" - "[Install]")) + (if built-in + (insert (propertize "Built-in." 'font-lock-face 'font-lock-builtin-face) + " Alternate version available -- ") + (insert "Available -- ")) + (let ((button-text (if (display-graphic-p) "Install" "[Install]")) (button-face (if (display-graphic-p) '(:box (:line-width 2 :color "dark grey") :background "light grey" :foreground "black") 'link))) - (insert-text-button button-text - 'face button-face - 'follow-link t + (insert-text-button button-text 'face button-face 'follow-link t 'package-symbol package 'action 'package-install-button-action))) (built-in - (insert (propertize "Built-in" - 'font-lock-face 'font-lock-builtin-face) ".")) + (insert (propertize "Built-in." 'font-lock-face 'font-lock-builtin-face))) (t (insert "Deleted."))) (insert "\n") - (and version - (> (length version) 0) + (and version (> (length version) 0) (insert " " (propertize "Version" 'font-lock-face 'bold) ": " version "\n")) - (setq reqs (package-desc-reqs desc)) + + (setq reqs (if desc (package-desc-reqs desc))) (when reqs (insert " " (propertize "Requires" 'font-lock-face 'bold) ": ") (let ((first t) @@ -1140,9 +1155,9 @@ (help-insert-xref-button text 'help-package name)) (insert "\n"))) (insert " " (propertize "Summary" 'font-lock-face 'bold) - ": " (package-desc-doc desc) "\n\n") + ": " (if desc (package-desc-doc desc)) "\n\n") - (if (assq package package--builtins) + (if built-in ;; For built-in packages, insert the commentary. (let ((fn (locate-file (concat package-name ".el") load-path load-file-rep-suffixes)) @@ -1477,31 +1492,36 @@ (defun package--generate-package-list () "Populate the current Package Menu buffer." - (package-initialize) (let ((inhibit-read-only t) info-list name desc hold builtin) (erase-buffer) ;; List installed packages (dolist (elt package-alist) (setq name (car elt)) + (when (or (null package-menu-package-list) + (memq name package-menu-package-list)) + (setq desc (cdr elt) + hold (cadr (assq name package-load-list))) + (setq info-list + (package-list-maybe-add + name (package-desc-vers desc) + ;; FIXME: it turns out to be tricky to see if this + ;; package is presently activated. + (if (stringp hold) "held" "installed") + (package-desc-doc desc) + info-list)))) + + ;; List built-in packages + (dolist (elt package--builtins) + (setq name (car elt)) (when (and (not (eq name 'emacs)) ; Hide the `emacs' package. (or (null package-menu-package-list) (memq name package-menu-package-list))) - (setq desc (cdr elt) - hold (cadr (assq name package-load-list)) - builtin (cdr (assq name package--builtins))) + (setq desc (cdr elt)) (setq info-list (package-list-maybe-add name (package-desc-vers desc) - ;; FIXME: it turns out to be tricky to see if this - ;; package is presently activated. - (cond ((stringp hold) "held") - ((and builtin - (version-list-= - (package-desc-vers builtin) - (package-desc-vers desc))) - "built-in") - (t "installed")) + "built-in" (package-desc-doc desc) info-list)))) @@ -1607,6 +1627,7 @@ "Generate and pop to the *Packages* buffer. Optional PACKAGES is a list of names of packages (symbols) to list; the default is to display everything in `package-alist'." + (require 'finder-inf nil t) (with-current-buffer (get-buffer-create "*Packages*") (package-menu-mode) (set (make-local-variable 'package-menu-package-list) packages) @@ -1624,8 +1645,8 @@ The list is displayed in a buffer named `*Packages*'." (interactive) ;; Initialize the package system if necessary. - (unless package-alist - (package-initialize)) + (unless package--initialized + (package-initialize t)) (package-refresh-contents) (package--list-packages)) ------------------------------------------------------------ revno: 102227 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-11-02 20:25:23 -0700 message: Silence compilation of nndiary.el. * lisp/gnus/nndiary.el (nndiary-generate-nov-databases-1) (nndiary-generate-active-info): Rename dynamic variable `files' to something less generic. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-03 01:06:33 +0000 +++ lisp/gnus/ChangeLog 2010-11-03 03:25:23 +0000 @@ -1,11 +1,17 @@ +2010-11-03 Glenn Morris + + * nndiary.el (nndiary-generate-nov-databases-1) + (nndiary-generate-active-info): Rename dynamic variable `files' to + something less generic. + 2010-11-03 Andrew Cohen - * nnir.el (nnir-request-move-article): call the underlying backend to + * nnir.el (nnir-request-move-article): Call the underlying backend to move articles from nnir. 2010-11-02 Lars Magne Ingebrigtsen - * gnus-cite.el (gnus-article-natural-long-line-p): Removed. + * gnus-cite.el (gnus-article-natural-long-line-p): Remove. 2010-11-02 Julien Danjou === modified file 'lisp/gnus/nndiary.el' --- lisp/gnus/nndiary.el 2010-09-18 23:36:29 +0000 +++ lisp/gnus/nndiary.el 2010-11-03 03:25:23 +0000 @@ -1061,9 +1061,9 @@ (file-directory-p dir)) (nndiary-generate-nov-databases-1 dir seen)))) ;; Do this directory. - (let ((files (sort (nnheader-article-to-file-alist dir) + (let ((nndiary-files (sort (nnheader-article-to-file-alist dir) 'car-less-than-car))) - (if (not files) + (if (not nndiary-files) (let* ((group (nnheader-file-to-group (directory-file-name dir) nndiary-directory)) (info (cadr (assoc group nndiary-group-alist)))) @@ -1071,11 +1071,11 @@ (setcar info (1+ (cdr info))))) (funcall nndiary-generate-active-function dir) ;; Generate the nov file. - (nndiary-generate-nov-file dir files) + (nndiary-generate-nov-file dir nndiary-files) (unless no-active (nnmail-save-active nndiary-group-alist nndiary-active-file)))))) -(defvar files) +(defvar nndiary-files) ; dynamically bound in nndiary-generate-nov-databases-1 (defun nndiary-generate-active-info (dir) ;; Update the active info for this group. (let* ((group (nnheader-file-to-group @@ -1084,9 +1084,9 @@ (last (or (caadr entry) 0))) (setq nndiary-group-alist (delq entry nndiary-group-alist)) (push (list group - (cons (or (caar files) (1+ last)) + (cons (or (caar nndiary-files) (1+ last)) (max last - (or (caar (last files)) + (or (caar (last nndiary-files)) 0)))) nndiary-group-alist))) ------------------------------------------------------------ revno: 102226 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2010-11-02 22:30:12 -0400 message: * lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): Handle __DATA__ and __END__. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-02 22:51:25 +0000 +++ lisp/ChangeLog 2010-11-03 02:30:12 +0000 @@ -1,3 +1,8 @@ +2010-11-03 Stefan Monnier + + * progmodes/perl-mode.el (perl-syntax-propertize-function): + Handle __DATA__ and __END__. + 2010-11-02 Noah Friedman * emacs-lisp/bytecomp.el (byte-recompile-file): If bytecomp-arg is === modified file 'lisp/progmodes/perl-mode.el' --- lisp/progmodes/perl-mode.el 2010-09-10 23:13:42 +0000 +++ lisp/progmodes/perl-mode.el 2010-11-03 02:30:12 +0000 @@ -274,6 +274,11 @@ ;; Be careful not to match "sub { (...) ... }". ("\\ c") + (0 (ignore (put-text-property (match-beginning 0) (match-end 0) + 'syntax-multiline t)))) ;; Regexp and funny quotes. Distinguishing a / that starts a regexp ;; match from the division operator is ...interesting. ;; Basically, / is a regexp match if it's preceded by an infix operator ------------------------------------------------------------ revno: 102225 author: Andrew Cohen committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2010-11-03 01:06:33 +0000 message: nnir.el (nnir-request-move-article): call the underlying backend to move articles from nnir. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-03 01:02:53 +0000 +++ lisp/gnus/ChangeLog 2010-11-03 01:06:33 +0000 @@ -1,3 +1,8 @@ +2010-11-03 Andrew Cohen + + * nnir.el (nnir-request-move-article): call the underlying backend to + move articles from nnir. + 2010-11-02 Lars Magne Ingebrigtsen * gnus-cite.el (gnus-article-natural-long-line-p): Removed. === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2010-11-02 11:28:45 +0000 +++ lisp/gnus/nnir.el 2010-11-03 01:06:33 +0000 @@ -636,6 +636,26 @@ (gnus-request-article artno artfullgroup nntp-server-buffer) (cons artfullgroup artno))))) +(deffoo nnir-request-move-article (article group server accept-form + &optional last internal-move-group) + (let* ((artitem (nnir-artlist-article nnir-artlist + article)) + (artfullgroup (nnir-artitem-group artitem)) + (artno (nnir-artitem-number artitem)) + (to-newsgroup (nth 1 accept-form)) + (to-method (gnus-find-method-for-group to-newsgroup)) + (from-method (gnus-find-method-for-group artfullgroup)) + (move-is-internal (gnus-server-equal from-method to-method))) + (gnus-request-move-article + artno + artfullgroup + (nth 1 from-method) + accept-form + last + (and move-is-internal + to-newsgroup ; Not respooling + (gnus-group-real-name to-newsgroup))) ; Is this move internal + )) (nnoo-define-skeleton nnir) ------------------------------------------------------------ revno: 102224 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2010-11-03 01:02:53 +0000 message: gnus-cite.el (gnus-article-natural-long-line-p): Removed. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-02 11:28:45 +0000 +++ lisp/gnus/ChangeLog 2010-11-03 01:02:53 +0000 @@ -1,3 +1,7 @@ +2010-11-02 Lars Magne Ingebrigtsen + + * gnus-cite.el (gnus-article-natural-long-line-p): Removed. + 2010-11-02 Julien Danjou * nnir.el: Remove wais support. === modified file 'lisp/gnus/gnus-cite.el' --- lisp/gnus/gnus-cite.el 2010-11-02 02:19:52 +0000 +++ lisp/gnus/gnus-cite.el 2010-11-03 01:02:53 +0000 @@ -592,24 +592,6 @@ ;; like code? Check for ragged edges on the left. (< (length columns) 3)))) -(defun gnus-article-natural-long-line-p () - "Return true if the current line is long, and it's natural text." - (save-excursion - (beginning-of-line) - (and - ;; The line is long. - (> (- (line-end-position) (line-beginning-position)) - (window-width)) - ;; It doesn't start with spaces. - (not (looking-at " ")) - ;; Not cited text. - (let ((line-number (1+ (count-lines (point-min) (point)))) - citep) - (dolist (elem gnus-cite-prefix-alist) - (when (member line-number (cdr elem)) - (setq citep t))) - (not citep))))) - (defun gnus-article-hide-citation (&optional arg force) "Toggle hiding of all cited text except attribution lines. See the documentation for `gnus-article-highlight-citation'. ------------------------------------------------------------ revno: 102223 committer: Noah Friedman branch nick: trunk timestamp: Tue 2010-11-02 15:51:25 -0700 message: (byte-recompile-file): If bytecomp-arg is nil, do not ask to recompile files that are not already compiled, and do not recompile them. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-02 01:50:26 +0000 +++ lisp/ChangeLog 2010-11-02 22:51:25 +0000 @@ -1,3 +1,9 @@ +2010-11-02 Noah Friedman + + * emacs-lisp/bytecomp.el (byte-recompile-file): If bytecomp-arg is + nil, do not ask to recompile files that are not already compiled, + and do not recompile them. + 2010-11-02 Chong Yidong * emacs-lisp/package.el (package-initialize): Ensure that === modified file 'lisp/emacs-lisp/bytecomp.el' --- lisp/emacs-lisp/bytecomp.el 2010-11-01 02:55:12 +0000 +++ lisp/emacs-lisp/bytecomp.el 2010-11-02 22:51:25 +0000 @@ -1626,9 +1626,10 @@ (or bytecomp-force (file-newer-than-file-p bytecomp-filename bytecomp-dest)) - (or (eq 0 bytecomp-arg) - (y-or-n-p (concat "Compile " - bytecomp-filename "? ")))) + (and bytecomp-arg + (or (eq 0 bytecomp-arg) + (y-or-n-p (concat "Compile " + bytecomp-filename "? "))))) (progn (if (and noninteractive (not byte-compile-verbose)) (message "Compiling %s..." bytecomp-filename)) ------------------------------------------------------------ revno: 102222 author: Julien Danjou committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2010-11-02 11:28:45 +0000 message: nnir: remove wais support diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-02 04:08:43 +0000 +++ lisp/gnus/ChangeLog 2010-11-02 11:28:45 +0000 @@ -1,3 +1,7 @@ +2010-11-02 Julien Danjou + + * nnir.el: Remove wais support. + 2010-11-02 Glenn Morris * gnus-html.el: Reorder requirements to quieten compiler. === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2010-11-01 23:47:38 +0000 +++ lisp/gnus/nnir.el 2010-11-02 11:28:45 +0000 @@ -208,35 +208,6 @@ :type '(string) :group 'nnir) -(defcustom nnir-wais-program "waissearch" - "*Name of waissearch executable." - :type '(string) - :group 'nnir) - -(defcustom nnir-wais-database (expand-file-name "~/.wais/mail") - "*Name of Wais database containing the mail. - -Note that this should be a file name without extension. For example, -if you have a file /home/john/.wais/mail.fmt, use this: - (setq nnir-wais-database \"/home/john/.wais/mail\") -The string given here is passed to `waissearch -d' as-is." - :type '(file) - :group 'nnir) - -(defcustom nnir-wais-remove-prefix (concat (getenv "HOME") "/Mail/") - "*The prefix to remove from each directory name returned by waissearch -in order to get a group name (albeit with / instead of .). This is a -regular expression. - -For example, suppose that Wais returns file names such as -\"/home/john/Mail/mail/misc/42\". For this example, use the following -setting: (setq nnir-wais-remove-prefix \"/home/john/Mail/\") -Note the trailing slash. Removing this prefix gives \"mail/misc/42\". -`nnir' knows to remove the \"/42\" and to replace \"/\" with \".\" to -arrive at the correct group name, \"mail.misc\"." - :type '(regexp) - :group 'nnir) - (defcustom nnir-swish++-configuration-file (expand-file-name "~/Mail/swish++.conf") "*Configuration file for swish++." @@ -413,9 +384,7 @@ ;;; Developer Extension Variable: (defvar nnir-engines - `((wais nnir-run-waissearch - ()) - (imap nnir-run-imap + `((imap nnir-run-imap ((criteria "Imap Search in" ; Prompt ,(mapcar 'car nnir-imap-search-arguments) ; alist for completing @@ -713,51 +682,6 @@ ;;; Search Engine Interfaces: -;; freeWAIS-sf interface. -(defun nnir-run-waissearch (query server &optional group) - "Run given query agains waissearch. Returns vector of (group name, file name) -pairs (also vectors, actually)." - ;; (when group - ;; (error "The freeWAIS-sf backend cannot search specific groups")) - (save-excursion - (let ((qstring (cdr (assq 'query query))) - (prefix (nnir-read-server-parm 'nnir-wais-remove-prefix server)) - artlist score artno dirnam) - (set-buffer (get-buffer-create nnir-tmp-buffer)) - (erase-buffer) - (message "Doing WAIS query %s..." query) - (call-process nnir-wais-program - nil ; input from /dev/null - t ; output to current buffer - nil ; don't redisplay - "-d" (nnir-read-server-parm 'nnir-wais-database server) ; database to search - qstring) - (message "Massaging waissearch output...") - ;; remove superfluous lines - (keep-lines "Score:") - ;; extract data from result lines - (goto-char (point-min)) - (while (re-search-forward - "Score: +\\([0-9]+\\).*'\\([0-9]+\\) +\\([^']+\\)/'" nil t) - (setq score (match-string 1) - artno (match-string 2) - dirnam (match-string 3)) - (unless (string-match prefix dirnam) - (nnheader-report 'nnir "Dir name %s doesn't contain prefix %s" - dirnam prefix)) - (setq group (gnus-replace-in-string - (replace-match "" t t dirnam) "/" ".")) - (push (vector (nnir-group-full-name group server) - (string-to-number artno) - (string-to-number score)) - artlist)) - (message "Massaging waissearch output...done") - (apply 'vector - (sort artlist - (function (lambda (x y) - (> (nnir-artitem-rsv x) - (nnir-artitem-rsv y))))))))) - ;; imap interface (defun nnir-run-imap (query srv &optional groups) "Run a search against an IMAP back-end server. ------------------------------------------------------------ revno: 102221 committer: Glenn Morris branch nick: trunk timestamp: Mon 2010-11-01 21:08:43 -0700 message: * lisp/gnus/gnus-html.el: Reorder requirements to quieten compiler. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-02 02:19:52 +0000 +++ lisp/gnus/ChangeLog 2010-11-02 04:08:43 +0000 @@ -1,3 +1,7 @@ +2010-11-02 Glenn Morris + + * gnus-html.el: Reorder requirements to quieten compiler. + 2010-11-02 Katsumi Yamaoka * gnus-cite.el (gnus-article-fill-cited-article): Make fill work @@ -8,10 +12,10 @@ 2010-11-01 Andrew Cohen - * nnir.el (nnir-run-gmane): inhibit demon. return nil if no messages. - (nnir-read-parms): don't modify query. - (nnir-run-query): add ability to search topic on current line. - (nnir-get-active): clean up. + * nnir.el (nnir-run-gmane): Inhibit demon. Return nil if no messages. + (nnir-read-parms): Don't modify query. + (nnir-run-query): Add ability to search topic on current line. + (nnir-get-active): Clean up. 2010-11-01 Lars Magne Ingebrigtsen === modified file 'lisp/gnus/gnus-html.el' --- lisp/gnus/gnus-html.el 2010-10-24 09:55:56 +0000 +++ lisp/gnus/gnus-html.el 2010-11-02 04:08:43 +0000 @@ -29,9 +29,10 @@ ;;; Code: (eval-when-compile (require 'cl)) + +(require 'gnus-art) (eval-when-compile (require 'mm-decode)) -(require 'gnus-art) (require 'mm-url) (require 'url) (require 'url-cache)