Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 103101. ------------------------------------------------------------ revno: 103101 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-02-02 23:37:43 -0800 message: Small faq.texi changes. * doc/misc/faq.texi (Contacting the FSF): Mainly just refer to the web-site. (Binding combinations of modifiers and function keys): Let's assume people reading this are not using Emacs 18. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-02-03 05:01:44 +0000 +++ doc/misc/ChangeLog 2011-02-03 07:37:43 +0000 @@ -1,3 +1,9 @@ +2011-02-03 Glenn Morris + + * faq.texi (Contacting the FSF): Mainly just refer to the web-site. + (Binding combinations of modifiers and function keys): + Let's assume people reading this are not using Emacs 18. + 2011-02-03 Lars Ingebrigtsen * gnus.texi (Article Date): Remove mention of gnus-stop-date-timer, === modified file 'doc/misc/faq.texi' --- doc/misc/faq.texi 2011-01-25 04:08:28 +0000 +++ doc/misc/faq.texi 2011-02-03 07:37:43 +0000 @@ -502,36 +502,13 @@ unsubscribe. @node Contacting the FSF -@section What is the current address of the FSF? -@cindex Snail mail address of the FSF -@cindex Postal address of the FSF +@section How do I contact the FSF? @cindex Contracting the FSF @cindex Free Software Foundation, contacting For up-to-date information, see @uref{http://www.fsf.org/about/contact.html, the FSF contact web-page}. - -@table @asis - -@item E-mail -info@@fsf.org - -@item Telephone -+1-617-542-5942 - -@item Fax -+1-617-542-2652 - -@item World Wide Web -@uref{http://www.fsf.org/} - -@item Postal address -Free Software Foundation@* -51 Franklin Street, Fifth Floor@* -Boston, MA 02110-1301@* -USA@* - -@end table +You can send general correspondence to @email{info@@fsf.org}. @cindex Ordering GNU software For details on how to order items directly from the FSF, see the @@ -3895,9 +3872,9 @@ @cindex Function keys and modifiers @cindex Binding modifiers and function keys -With Emacs 19 and later, you can represent modified function keys in -vector format by adding prefixes to the function key symbol. For -example (from the Emacs documentation): +You can represent modified function keys in vector format by adding +prefixes to the function key symbol. For example (from the Emacs +documentation): @lisp (global-set-key [?\C-x right] 'forward-page) ------------------------------------------------------------ revno: 103100 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-02-02 23:33:16 -0800 message: * lisp/vc/vc-hg.el (vc-hg-command): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-03 07:31:42 +0000 +++ lisp/ChangeLog 2011-02-03 07:33:16 +0000 @@ -1,5 +1,7 @@ 2011-02-03 Glenn Morris + * vc/vc-hg.el (vc-hg-command): Doc fix. + * term/w32-win.el (libpng-version): Declare for compiler. * msb.el: No need to load dired while compiling. === modified file 'lisp/vc/vc-hg.el' --- lisp/vc/vc-hg.el 2011-01-29 21:19:21 +0000 +++ lisp/vc/vc-hg.el 2011-02-03 07:33:16 +0000 @@ -662,8 +662,8 @@ (defun vc-hg-command (buffer okstatus file-or-list &rest flags) "A wrapper around `vc-do-command' for use in vc-hg.el. -The difference to vc-do-command is that this function always invokes `hg', -and that it passes `vc-hg-global-switches' to it before FLAGS." +This function differs from vc-do-command in that it invokes +`vc-hg-program', and passes `vc-hg-global-switches' to it before FLAGS." (apply 'vc-do-command (or buffer "*vc*") okstatus vc-hg-program file-or-list (if (stringp vc-hg-global-switches) (cons vc-hg-global-switches flags) ------------------------------------------------------------ revno: 103099 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-02-02 23:31:42 -0800 message: * lisp/term/w32-win.el (libpng-version): Declare for compiler. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-03 07:29:38 +0000 +++ lisp/ChangeLog 2011-02-03 07:31:42 +0000 @@ -1,5 +1,7 @@ 2011-02-03 Glenn Morris + * term/w32-win.el (libpng-version): Declare for compiler. + * msb.el: No need to load dired while compiling. * emacs-lisp/elint.el (elint-standard-variables): === modified file 'lisp/term/w32-win.el' --- lisp/term/w32-win.el 2011-01-25 04:08:28 +0000 +++ lisp/term/w32-win.el 2011-02-03 07:31:42 +0000 @@ -186,6 +186,7 @@ (error "Suspending an Emacs running under W32 makes no sense")) (defvar dynamic-library-alist) +(defvar libpng-version) ; image.c #ifdef HAVE_NTGUI ;;; Set default known names for external libraries (setq dynamic-library-alist ------------------------------------------------------------ revno: 103098 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-02-02 23:29:38 -0800 message: * lisp/msb.el: No need to load dired while compiling. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-03 07:27:59 +0000 +++ lisp/ChangeLog 2011-02-03 07:29:38 +0000 @@ -1,5 +1,7 @@ 2011-02-03 Glenn Morris + * msb.el: No need to load dired while compiling. + * emacs-lisp/elint.el (elint-standard-variables): Remove a couple of built-ins that now have doc-strings. === modified file 'lisp/msb.el' --- lisp/msb.el 2011-01-31 23:54:50 +0000 +++ lisp/msb.el 2011-02-03 07:29:38 +0000 @@ -399,8 +399,6 @@ (format "%s%s %s" modified read-only name))) -(eval-when-compile (require 'dired)) - ;; `dired' can be called with a list of the form (directory file1 file2 ...) ;; which causes `dired-directory' to be in the same form. (defun msb--dired-directory () ------------------------------------------------------------ revno: 103097 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-02-02 23:27:59 -0800 message: elint.el trivia. * lisp/emacs-lisp/elint.el (elint-standard-variables): Remove a couple of built-ins that now have doc-strings. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-03 07:21:56 +0000 +++ lisp/ChangeLog 2011-02-03 07:27:59 +0000 @@ -1,5 +1,8 @@ 2011-02-03 Glenn Morris + * emacs-lisp/elint.el (elint-standard-variables): + Remove a couple of built-ins that now have doc-strings. + * hi-lock.el, ps-bdf.el, ps-mule.el, ps-print.el, ps-samp.el: `require' is automatically `eval-and-compile'd. === modified file 'lisp/emacs-lisp/elint.el' --- lisp/emacs-lisp/elint.el 2011-01-25 04:08:28 +0000 +++ lisp/emacs-lisp/elint.el 2011-02-03 07:27:59 +0000 @@ -122,7 +122,6 @@ ;; FIXME I don't see why they shouldn't just get doc-strings. '(vc-mode local-write-file-hooks activate-menubar-hook buffer-name-history coding-system-history extended-command-history - kbd-macro-termination-hook read-expression-history yes-or-no-p-history) "Standard variables, excluding `elint-builtin-variables'. These are variables that we cannot detect automatically for some reason.") ------------------------------------------------------------ revno: 103096 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-02-02 23:25:14 -0800 message: Silence some compiler warnings. * lisp/gnus/nnheader.el (gnus-range-add, gnus-remove-from-range): Autoload. * lisp/gnus/nnimap.el (gnus-fetch-headers): Declare. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-02-03 05:26:36 +0000 +++ lisp/gnus/ChangeLog 2011-02-03 07:25:14 +0000 @@ -1,3 +1,9 @@ +2011-02-03 Glenn Morris + + * nnimap.el (gnus-fetch-headers): Declare. + + * nnheader.el (gnus-range-add, gnus-remove-from-range): Autoload. + 2011-02-03 Lars Ingebrigtsen * message.el (message-forward-make-body-digest-plain) === modified file 'lisp/gnus/nnheader.el' --- lisp/gnus/nnheader.el 2011-01-26 08:36:39 +0000 +++ lisp/gnus/nnheader.el 2011-02-03 07:25:14 +0000 @@ -43,6 +43,8 @@ (require 'mail-utils) (require 'mm-util) (require 'gnus-util) +(autoload 'gnus-range-add "gnus-range") +(autoload 'gnus-remove-from-range "gnus-range") ;; FIXME none of these are used explicitly in this file. (autoload 'gnus-sorted-intersection "gnus-range") (autoload 'gnus-intersection "gnus-range") === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2011-01-31 04:41:38 +0000 +++ lisp/gnus/nnimap.el 2011-02-03 07:25:14 +0000 @@ -1473,6 +1473,9 @@ (setq nnimap-status-string "Read-only server") nil) +(declare-function gnus-fetch-headers "gnus-sum" + (articles &optional limit force-new dependencies)) + (deffoo nnimap-request-thread (header) (let* ((id (mail-header-id header)) (refs (split-string ------------------------------------------------------------ revno: 103095 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-02-02 23:21:56 -0800 message: `require' is automatically `eval-and-compile'd. * hi-lock.el, ps-bdf.el, ps-mule.el, ps-print.el, ps-samp.el: `require' is automatically `eval-and-compile'd. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-03 07:14:02 +0000 +++ lisp/ChangeLog 2011-02-03 07:21:56 +0000 @@ -1,5 +1,8 @@ 2011-02-03 Glenn Morris + * hi-lock.el, ps-bdf.el, ps-mule.el, ps-print.el, ps-samp.el: + `require' is automatically `eval-and-compile'd. + * net/rcirc.el (rcirc-nick-completion-format): Add :version tag. (rcirc-log-directory, rcirc-log-flag): Move definitions before use. === modified file 'lisp/hi-lock.el' --- lisp/hi-lock.el 2011-01-25 04:08:28 +0000 +++ lisp/hi-lock.el 2011-02-03 07:21:56 +0000 @@ -87,8 +87,7 @@ ;;; Code: -(eval-and-compile - (require 'font-lock)) +(require 'font-lock) (defgroup hi-lock nil "Interactively add and remove font-lock patterns for highlighting text." === modified file 'lisp/ps-bdf.el' --- lisp/ps-bdf.el 2011-01-26 08:36:39 +0000 +++ lisp/ps-bdf.el 2011-02-03 07:21:56 +0000 @@ -5,7 +5,6 @@ ;; 2008, 2009, 2010, 2011 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H14PRO021 - ;; Copyright (C) 2003 ;; National Institute of Advanced Industrial Science and Technology (AIST) ;; Registration Number H13PRO009 @@ -37,8 +36,7 @@ ;;; Code: -(eval-and-compile - (require 'ps-mule)) +(require 'ps-mule) ;;;###autoload (defcustom bdf-directory-list === modified file 'lisp/ps-mule.el' --- lisp/ps-mule.el 2011-01-25 04:08:28 +0000 +++ lisp/ps-mule.el 2011-02-03 07:21:56 +0000 @@ -88,8 +88,7 @@ ;;; Code: -(eval-and-compile - (require 'ps-print)) +(require 'ps-print) ;;;###autoload === modified file 'lisp/ps-print.el' --- lisp/ps-print.el 2011-01-28 16:58:04 +0000 +++ lisp/ps-print.el 2011-02-03 07:21:56 +0000 @@ -1479,7 +1479,7 @@ ;; Load XEmacs/Emacs definitions -(eval-and-compile (require 'ps-def)) +(require 'ps-def) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -6657,7 +6657,7 @@ ;; But autoload them here to make the separation invisible. ;;;### (autoloads (ps-mule-end-job ps-mule-begin-job ps-mule-initialize -;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "0e9db04f70d1221af96488068afa1192") +;;;;;; ps-multibyte-buffer) "ps-mule" "ps-mule.el" "14536f28e0dcaa956901bb59ad86a875") ;;; Generated autoloads from ps-mule.el (defvar ps-multibyte-buffer nil "\ === modified file 'lisp/ps-samp.el' --- lisp/ps-samp.el 2011-01-25 04:08:28 +0000 +++ lisp/ps-samp.el 2011-02-03 07:21:56 +0000 @@ -34,7 +34,7 @@ ;;; Code: -(eval-and-compile (require 'ps-print)) +(require 'ps-print) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; @@ -254,9 +254,8 @@ (eval-when-compile (require 'cl)) -(eval-and-compile - (require 'printing) - (require 'zeroconf)) +(require 'printing) +(require 'zeroconf) ;; Add a Postscript printer to the "Postscript printer" menu. (defun ps-add-printer (service) ------------------------------------------------------------ revno: 103094 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-02-02 23:15:31 -0800 message: * lisp/obsolete/spell.el: Fix header comment. diff: === modified file 'lisp/obsolete/spell.el' --- lisp/obsolete/spell.el 2011-01-25 04:08:28 +0000 +++ lisp/obsolete/spell.el 2011-02-03 07:15:31 +0000 @@ -4,7 +4,7 @@ ;; Maintainer: FSF ;; Keywords: wp, unix -;; Obsolete-since: 23.1 +;; Obsolete-since: 24.1 ;; This file is part of GNU Emacs. ------------------------------------------------------------ revno: 103093 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-02-02 23:14:02 -0800 message: rcirc.el trivia. * lisp/net/rcirc.el (rcirc-nick-completion-format): Add :version tag. (rcirc-log-directory, rcirc-log-flag): Move definitions before use. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-03 07:11:31 +0000 +++ lisp/ChangeLog 2011-02-03 07:14:02 +0000 @@ -1,5 +1,8 @@ 2011-02-03 Glenn Morris + * net/rcirc.el (rcirc-nick-completion-format): Add :version tag. + (rcirc-log-directory, rcirc-log-flag): Move definitions before use. + * strokes.el (strokes-fill-current-buffer-with-whitespace): Move definition before use. (strokes-report-bug): Make it obsolete. === modified file 'lisp/net/rcirc.el' --- lisp/net/rcirc.el 2011-01-31 23:54:50 +0000 +++ lisp/net/rcirc.el 2011-02-03 07:14:02 +0000 @@ -328,6 +328,7 @@ The format string is only used when completing at the beginning of a line. The string is passed as the first argument to `format' with the nickname as the second argument." + :version "24.1" :type 'string :group 'rcirc) @@ -1034,6 +1035,17 @@ (or (eq (aref target 0) ?#) (eq (aref target 0) ?&)))) +(defcustom rcirc-log-directory "~/.emacs.d/rcirc-log" + "Directory to keep IRC logfiles." + :type 'directory + :group 'rcirc) + +(defcustom rcirc-log-flag nil + "Non-nil means log IRC activity to disk. +Logfiles are kept in `rcirc-log-directory'." + :type 'boolean + :group 'rcirc) + (defun rcirc-kill-buffer-hook () "Part the channel when killing an rcirc buffer." (when (eq major-mode 'rcirc-mode) @@ -1364,17 +1376,6 @@ (defvar rcirc-last-sender nil) (make-variable-buffer-local 'rcirc-last-sender) -(defcustom rcirc-log-directory "~/.emacs.d/rcirc-log" - "Directory to keep IRC logfiles." - :type 'directory - :group 'rcirc) - -(defcustom rcirc-log-flag nil - "Non-nil means log IRC activity to disk. -Logfiles are kept in `rcirc-log-directory'." - :type 'boolean - :group 'rcirc) - (defcustom rcirc-omit-threshold 100 "Number of lines since last activity from a nick before `rcirc-omit-responses' are omitted." :type 'integer ------------------------------------------------------------ revno: 103092 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-02-02 23:11:31 -0800 message: strokes.el trivia. * lisp/strokes.el (strokes-fill-current-buffer-with-whitespace): Move definition before use. (strokes-report-bug): Make it obsolete. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-02 17:59:44 +0000 +++ lisp/ChangeLog 2011-02-03 07:11:31 +0000 @@ -1,3 +1,9 @@ +2011-02-03 Glenn Morris + + * strokes.el (strokes-fill-current-buffer-with-whitespace): + Move definition before use. + (strokes-report-bug): Make it obsolete. + 2011-02-02 Sam Steingold * apropos.el (apropos-print): Now that `apropos-mode' inherits === modified file 'lisp/strokes.el' --- lisp/strokes.el 2011-01-25 04:08:28 +0000 +++ lisp/strokes.el 2011-02-03 07:11:31 +0000 @@ -718,6 +718,14 @@ nil)) nil)) +(defsubst strokes-fill-current-buffer-with-whitespace () + "Erase the contents of the current buffer and fill it with whitespace." + (erase-buffer) + (loop repeat (frame-height) do + (insert-char ?\s (1- (frame-width))) + (newline)) + (goto-char (point-min))) + ;;;###autoload (defun strokes-read-stroke (&optional prompt event) "Read a simple stroke (interactively) and return the stroke. @@ -1034,15 +1042,7 @@ (help-mode) (help-print-return-message))) -(defalias 'strokes-report-bug 'report-emacs-bug) - -(defsubst strokes-fill-current-buffer-with-whitespace () - "Erase the contents of the current buffer and fill it with whitespace." - (erase-buffer) - (loop repeat (frame-height) do - (insert-char ?\s (1- (frame-width))) - (newline)) - (goto-char (point-min))) +(define-obsolete-function-alias 'strokes-report-bug 'report-emacs-bug "24.1") (defun strokes-window-configuration-changed-p () "Non-nil if the `strokes-window-configuration' frame properties changed. ------------------------------------------------------------ revno: 103091 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-02-02 23:09:50 -0800 message: bzrmerge.el trivia. * admin/bzrmerge.el (bzrmerge-buffer): New constant. (bzrmerge-merges, bzrmerge-missing, bzrmerge-apply): Use it. (bzrmerge-missing): If nothing to do, return nil not (nil). (bzrmerge-apply): Remove odd character from message. (bzrmerge): Give status messages. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2011-01-31 19:36:08 +0000 +++ admin/ChangeLog 2011-02-03 07:09:50 +0000 @@ -1,7 +1,15 @@ +2011-02-03 Glenn Morris + + * bzrmerge.el (bzrmerge-buffer): New constant. + (bzrmerge-merges, bzrmerge-missing, bzrmerge-apply): Use it. + (bzrmerge-missing): If nothing to do, return nil not (nil). + (bzrmerge-apply): Remove odd character from message. + (bzrmerge): Give status messages. + 2011-01-31 Eli Zaretskii - * admin.el (set-version): Remove lib-src/makefile.w32-in. Add - nt/config.nt. + * admin.el (set-version): Remove lib-src/makefile.w32-in. + Add nt/config.nt. 2011-01-31 Paul Eggert === modified file 'admin/bzrmerge.el' --- admin/bzrmerge.el 2011-01-25 05:10:02 +0000 +++ admin/bzrmerge.el 2011-02-03 07:09:50 +0000 @@ -1,4 +1,4 @@ -;;; bzrmerge.el --- +;;; bzrmerge.el --- help merge one Emacs bzr branch to another ;; Copyright (C) 2010-2011 Free Software Foundation, Inc. @@ -20,7 +20,7 @@ ;;; Commentary: -;; +;; Some usage notes are in admin/notes/bzr. ;;; Code: @@ -32,10 +32,13 @@ "Regexp matching logs of revisions that might be skipped. `bzrmerge-missing' will ask you if it should skip any matches.") +(defconst bzrmerge-buffer "*bzrmerge*" + "Working buffer for bzrmerge.") + (defun bzrmerge-merges () "Return the list of already merged (not yet committed) revisions. The list returned is sorted by oldest-first." - (with-current-buffer (get-buffer-create "*bzrmerge*") + (with-current-buffer (get-buffer-create bzrmerge-buffer) (erase-buffer) ;; We generally want to make sure we start with a clean tree, but we also ;; want to allow restarts (i.e. with some part of FROM already merged but @@ -99,7 +102,7 @@ Asks about skipping revisions with logs matching `bzrmerge-skip-regexp'. The result is of the form (TOMERGE . TOSKIP) where TOMERGE and TOSKIP are both lists of revnos, in oldest-first order." - (with-current-buffer (get-buffer-create "*bzrmerge*") + (with-current-buffer (get-buffer-create bzrmerge-buffer) (erase-buffer) (call-process "bzr" nil t nil "missing" "--theirs-only" (expand-file-name from)) @@ -133,7 +136,8 @@ (push revno skipped) (push revno revnos))))) (delete-region (point) (point-max))) - (cons (nreverse revnos) (nreverse skipped))))) + (and (or revnos skipped) + (cons (nreverse revnos) (nreverse skipped)))))) (defun bzrmerge-resolve (file) (unless (file-exists-p file) (error "Bzrmerge-resolve: Can't find %s" file)) @@ -216,7 +220,7 @@ (defun bzrmerge-apply (missing from) (setq from (expand-file-name from)) - (with-current-buffer (get-buffer-create "*bzrmerge*") + (with-current-buffer (get-buffer-create bzrmerge-buffer) (erase-buffer) (when (equal (cdr bzrmerge-already-done) (list from missing)) (setq missing (car bzrmerge-already-done))) @@ -285,7 +289,7 @@ ;; bzrmerge-add-metadata does not work when there ;; are conflicts. (display-warning 'bzrmerge "Resolve conflicts manually. -¡BEWARE! Important metadata is kept in this Emacs session! +¡BEWARE! Important metadata is kept in this Emacs session! Do not commit without re-running `M-x bzrmerge' first!")) (error "Resolve conflicts manually"))))) (cons merge skip))))) @@ -309,8 +313,11 @@ (let* ((merges (bzrmerge-merges)) ;; OK, we have the status, now check the missing data. (missing (bzrmerge-missing from merges))) - (while missing - (setq missing (bzrmerge-apply missing from)))))) + (if (not missing) + (message "Merging from %s...nothing to merge" from) + (while missing + (setq missing (bzrmerge-apply missing from))) + (message "Merging from %s...done" from))))) (provide 'bzrmerge) ;;; bzrmerge.el ends here ------------------------------------------------------------ revno: 103090 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Wed 2011-02-02 22:23:35 -0800 message: Fix the ChangeLog message to be more legible. diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2011-02-03 06:22:07 +0000 +++ lisp/url/ChangeLog 2011-02-03 06:23:35 +0000 @@ -1,7 +1,8 @@ 2011-02-03 Lars Ingebrigtsen * url-http.el (url-http-wait-for-headers-change-function): Don't - move if the callback function has moved point. + move point if the callback function has moved changed/killed the + process buffer. 2010-12-16 Miles Bader > ------------------------------------------------------------ revno: 103089 committer: Lars Ingebrigtsen branch nick: trunk timestamp: Wed 2011-02-02 22:22:07 -0800 message: (url-http-wait-for-headers-change-function): Don't move if the callback function has moved point. diff: === modified file 'lisp/url/ChangeLog' --- lisp/url/ChangeLog 2011-01-25 04:08:28 +0000 +++ lisp/url/ChangeLog 2011-02-03 06:22:07 +0000 @@ -1,3 +1,8 @@ +2011-02-03 Lars Ingebrigtsen + + * url-http.el (url-http-wait-for-headers-change-function): Don't + move if the callback function has moved point. + 2010-12-16 Miles Bader > * url-cookie.el: Require 'cl when compiling -- it's necessary for === modified file 'lisp/url/url-http.el' --- lisp/url/url-http.el 2011-01-25 04:08:28 +0000 +++ lisp/url/url-http.el 2011-02-03 06:22:07 +0000 @@ -1034,10 +1034,11 @@ url-http-response-status)) (url-http-debug "url-http-wait-for-headers-change-function (%s)" (buffer-name)) - (when (not (bobp)) - (let ((end-of-headers nil) - (old-http nil) - (content-length nil)) + (let ((end-of-headers nil) + (old-http nil) + (process-buffer (current-buffer)) + (content-length nil)) + (when (not (bobp)) (goto-char (point-min)) (if (and (looking-at ".*\n") ; have one line at least (not (looking-at "^HTTP/[1-9]\\.[0-9]"))) @@ -1151,8 +1152,9 @@ 'url-http-simple-after-change-function))))) ;; We are still at the beginning of the buffer... must just be ;; waiting for a response. - (url-http-debug "Spinning waiting for headers...")) - (goto-char (point-max))) + (url-http-debug "Spinning waiting for headers...") + (when (eq process-buffer (current-buffer)) + (goto-char (point-max))))) ;;;###autoload (defun url-http (url callback cbargs) ------------------------------------------------------------ revno: 103088 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2011-02-03 05:26:36 +0000 message: message.el (message-forward-make-body-digest-plain) (message-followup, message-reply): Clean up things noted by Stefan. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-02-03 05:21:20 +0000 +++ lisp/gnus/ChangeLog 2011-02-03 05:26:36 +0000 @@ -1,5 +1,8 @@ 2011-02-03 Lars Ingebrigtsen + * message.el (message-forward-make-body-digest-plain) + (message-followup, message-reply): Clean up things noted by Stefan. + * gnus-art.el (gnus-article-setup-buffer): Stop the date timer if gnus-article-update-date-headers is nil. (gnus-article-date-headers): Rip out the old -treat-date-* stuff, since === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2011-02-01 14:09:20 +0000 +++ lisp/gnus/message.el 2011-02-03 05:26:36 +0000 @@ -4345,7 +4345,6 @@ (tembuf (message-generate-new-buffer-clone-locals " message temp")) (curbuf (current-buffer)) (id (message-make-message-id)) (n 1) - required-mail-headers ;FIXME: Unused, right? --Stef plist total header) (while (not (eobp)) (if (< (point-max) (+ p message-send-mail-partially-limit)) @@ -6776,7 +6775,6 @@ (require 'gnus-sum) ; for gnus-list-identifiers (let ((cur (current-buffer)) from subject date - reply-to to cc ;FIXME: These 3 seem to be unused? --Stef references message-id follow-to (inhibit-point-motion-hooks t) (message-this-is-mail t) @@ -7297,11 +7295,9 @@ (defun message-forward-make-body-digest-plain (forward-buffer) (insert "\n-------------------- Start of forwarded message --------------------\n") - (let ((b (point)) e) ;FIXME: Not used, right? --Stef - (mml-insert-buffer forward-buffer) - (setq e (point)) - (insert - "\n-------------------- End of forwarded message --------------------\n"))) + (mml-insert-buffer forward-buffer) + (insert + "\n-------------------- End of forwarded message --------------------\n")) (defun message-forward-make-body-digest-mime (forward-buffer) (insert "\n<#multipart type=digest>\n") ------------------------------------------------------------ revno: 103087 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2011-02-03 05:21:20 +0000 message: gnus-art.el (gnus-article-date-headers): Rip out the old -treat-date-* stuff, since it didn't really work with defcustom. (article-update-date-lapsed): Make sure the window start doesn't move, either. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-02-03 05:01:44 +0000 +++ lisp/gnus/ChangeLog 2011-02-03 05:21:20 +0000 @@ -2,6 +2,10 @@ * gnus-art.el (gnus-article-setup-buffer): Stop the date timer if gnus-article-update-date-headers is nil. + (gnus-article-date-headers): Rip out the old -treat-date-* stuff, since + it didn't really work with defcustom. + (article-update-date-lapsed): Make sure the window start doesn't move, + either. 2011-02-01 Julien Danjou === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-02-03 05:01:44 +0000 +++ lisp/gnus/gnus-art.el 2011-02-03 05:21:20 +0000 @@ -1014,24 +1014,7 @@ :group 'gnus-article-mime :type '(repeat (cons :format "%v" (string :tag "MIME type") function))) -(defcustom gnus-article-date-headers - (let ((types '(ut local english lapsed combined-lapsed - iso8601 original user-defined)) - default) - ;; Try to respect the legacy `gnus-treat-date-*' variables, if - ;; they're set. - (dolist (type types) - (let ((variable (intern (format "gnus-treat-date-%s" type)))) - (when (and (boundp variable) - (symbol-value variable)) - (push type default)))) - (when (and (or (not (boundp (intern "gnus-article-date-lapsed-new-header"))) - (not (symbol-value (intern "gnus-article-date-lapsed-new-header")))) - (memq 'lapsed default)) - (setq default (delq 'lapsed default))) - (or default - ;; If they weren't set, we default to `combined-lapsed'. - '(combined-lapsed))) +(defcustom gnus-article-date-headers '(combined-lapsed) "A list of Date header formats to display. Valid formats are `ut' (universal time), `local' (local time zone), `english' (readable English), `lapsed' (elapsed time), @@ -3645,14 +3628,25 @@ (set-buffer (window-buffer w)) (when (eq major-mode 'gnus-article-mode) (let ((old-line (count-lines (point-min) (point))) - (old-column (- (point) (line-beginning-position)))) + (old-column (- (point) (line-beginning-position))) + (window-start + (window-start (get-buffer-window (current-buffer))))) (goto-char (point-min)) (while (re-search-forward "^Date:" nil t) - (let ((type (get-text-property (match-beginning 0) 'gnus-date-type))) + (let ((type (get-text-property (match-beginning 0) + 'gnus-date-type))) (when (memq type '(lapsed combined-lapsed user-format)) + (unless (= window-start + (save-excursion + (forward-line 1) + (point))) + (setq window-start nil)) (save-excursion (article-date-ut type t (match-beginning 0))) - (forward-line 1)))) + (forward-line 1) + (when window-start + (set-window-start (get-buffer-window (current-buffer)) + (point)))))) (goto-char (point-min)) (when (> old-column 0) (setq old-line (1- old-line))) ------------------------------------------------------------ revno: 103086 author: Lars Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2011-02-03 05:01:44 +0000 message: gnus-art.el (gnus-article-setup-buffer): Stop the date timer if gnus-article-update-date-headers is nil. gnus.texi (Article Date): Remove mention of gnus-stop-date-timer, since it's run automatically. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2011-02-01 11:02:10 +0000 +++ doc/misc/ChangeLog 2011-02-03 05:01:44 +0000 @@ -1,3 +1,8 @@ +2011-02-03 Lars Ingebrigtsen + + * gnus.texi (Article Date): Remove mention of gnus-stop-date-timer, + since it's run automatically. + 2011-02-01 Lars Ingebrigtsen * gnus.texi (Customizing Articles): Fix typo. === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2011-02-01 11:02:10 +0000 +++ doc/misc/gnus.texi 2011-02-03 05:01:44 +0000 @@ -9503,8 +9503,7 @@ (setq gnus-article-update-date-headers nil) @end lisp -in your @file{~/.gnus.el} file. If you want to stop the updating -dynamically, you can use the @code{gnus-stop-date-timer} command. +in your @file{~/.gnus.el} file. @item W T o @kindex W T o (Summary) === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-02-01 23:46:27 +0000 +++ lisp/gnus/ChangeLog 2011-02-03 05:01:44 +0000 @@ -1,3 +1,8 @@ +2011-02-03 Lars Ingebrigtsen + + * gnus-art.el (gnus-article-setup-buffer): Stop the date timer if + gnus-article-update-date-headers is nil. + 2011-02-01 Julien Danjou * mm-uu.el (mm-uu-type-alist): Add support for git format-patch diff === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-02-01 03:54:46 +0000 +++ lisp/gnus/gnus-art.el 2011-02-03 05:01:44 +0000 @@ -4505,9 +4505,13 @@ (setq gnus-summary-buffer (gnus-summary-buffer-name gnus-newsgroup-name)) (gnus-summary-set-local-parameters gnus-newsgroup-name) - (when (and gnus-article-update-date-headers - (not article-lapsed-timer)) + (cond + ((and gnus-article-update-date-headers + (not article-lapsed-timer)) (gnus-start-date-timer gnus-article-update-date-headers)) + ((and (not gnus-article-update-date-headers) + article-lapsed-timer) + (gnus-stop-date-timer))) (current-buffer))))) ;; Set article window start at LINE, where LINE is the number of lines ------------------------------------------------------------ revno: 103085 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-02-02 15:44:19 -0500 message: * modes.texi (Major Mode Conventions): Add face guidelines. (Faces for Font Lock): List faces in order of prominence. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-02-01 07:23:48 +0000 +++ doc/lispref/ChangeLog 2011-02-02 20:44:19 +0000 @@ -1,3 +1,8 @@ +2011-02-02 Chong Yidong + + * modes.texi (Major Mode Conventions): Add face guidelines. + (Faces for Font Lock): List faces in order of prominence. + 2011-02-01 Paul Eggert format-time-string now supports subsecond time stamp resolution === modified file 'doc/lispref/modes.texi' --- doc/lispref/modes.texi 2011-01-25 04:08:28 +0000 +++ doc/lispref/modes.texi 2011-02-02 20:44:19 +0000 @@ -415,6 +415,31 @@ @code{font-lock-defaults} (@pxref{Font Lock Mode}). @item +Each face that the mode defines should, if possible, inherit from an +existing Emacs face. This reduces the chance of conflicting with a +user's face customizations. Useful faces include: + +@table @asis +@item @code{highlight} +for stretches of text that should temporarily stand out. + +@item @code{match} +for text matching a search command. + +@item @code{link} and @code{link-visited} +for clickable text buttons that send the user to a different buffer or +``location''. + +@item @code{button} +for clickable text buttons that perform other actions. + +@item @asis{Font Lock faces} +for other kinds of syntactic highlighting, if highlighting is not +handled by Font Lock mode or some Font Lock faces are not in use. +@xref{Faces for Font Lock}, for how to assign Font Lock faces. +@end table + +@item The mode should specify how Imenu should find the definitions or sections of a buffer, by setting up a buffer-local value for the variable @code{imenu-generic-expression}, for the two variables @@ -2879,73 +2904,79 @@ @cindex faces for font lock @cindex font lock faces - You can make Font Lock mode use any face, but several faces are -defined specifically for Font Lock mode. Each of these symbols is both -a face name, and a variable whose default value is the symbol itself. -Thus, the default value of @code{font-lock-comment-face} is -@code{font-lock-comment-face}. This means you can write -@code{font-lock-comment-face} in a context such as -@code{font-lock-keywords} where a face-name-valued expression is used. + Font Lock mode can highlight using any face, but Emacs defines several +faces specifically for syntactic highlighting. These @dfn{Font Lock +faces} are listed below. They can also be used by major modes for +syntactic highlighting outside of Font Lock mode (@pxref{Major Mode +Conventions}). + + Each of these symbols is both a face name, and a variable whose +default value is the symbol itself. Thus, the default value of +@code{font-lock-comment-face} is @code{font-lock-comment-face}. + + The faces are listed with descriptions of their typical usage, and in +order of greater to lesser ``prominence''. If a mode's syntactic +categories do not fit well with the usage descriptions, the faces can be +assigned using the ordering as a guide. @table @code +@item font-lock-warning-face +@vindex font-lock-warning-face +for a construct that is peculiar, or that greatly changes the meaning of +other text, like @samp{;;;###autoload} in Emacs Lisp and @samp{#error} +in C. + +@item font-lock-function-name-face +@vindex font-lock-function-name-face +for the name of a function being defined or declared. + +@item font-lock-variable-name-face +@vindex font-lock-variable-name-face +for the name of a variable being defined or declared. + +@item font-lock-keyword-face +@vindex font-lock-keyword-face +for a keyword with special syntactic significance, like @samp{for} and +@samp{if} in C. + @item font-lock-comment-face @vindex font-lock-comment-face -Used (typically) for comments. +for comments. @item font-lock-comment-delimiter-face @vindex font-lock-comment-delimiter-face -Used (typically) for comments delimiters. - -@item font-lock-doc-face -@vindex font-lock-doc-face -Used (typically) for documentation strings in the code. - -@item font-lock-string-face -@vindex font-lock-string-face -Used (typically) for string constants. - -@item font-lock-keyword-face -@vindex font-lock-keyword-face -Used (typically) for keywords---names that have special syntactic -significance, like @code{for} and @code{if} in C. - -@item font-lock-builtin-face -@vindex font-lock-builtin-face -Used (typically) for built-in function names. - -@item font-lock-function-name-face -@vindex font-lock-function-name-face -Used (typically) for the name of a function being defined or declared, -in a function definition or declaration. - -@item font-lock-variable-name-face -@vindex font-lock-variable-name-face -Used (typically) for the name of a variable being defined or declared, -in a variable definition or declaration. +for comments delimiters, like @samp{/*} and @samp{*/} in C. On most +terminals, this inherits from @code{font-lock-comment-face}. @item font-lock-type-face @vindex font-lock-type-face -Used (typically) for names of user-defined data types, -where they are defined and where they are used. +for the names of user-defined data types. @item font-lock-constant-face @vindex font-lock-constant-face -Used (typically) for constant names. +for the names of constants, like @samp{NULL} in C. + +@item font-lock-builtin-face +@vindex font-lock-builtin-face +for the names of built-in functions. @item font-lock-preprocessor-face @vindex font-lock-preprocessor-face -Used (typically) for preprocessor commands. +for preprocessor commands. This inherits, by default, from +@code{font-lock-builtin-face}. + +@item font-lock-string-face +@vindex font-lock-string-face +for string constants. + +@item font-lock-doc-face +@vindex font-lock-doc-face +for documentation strings in the code. This inherits, by default, from +@code{font-lock-string-face}. @item font-lock-negation-char-face @vindex font-lock-negation-char-face -Used (typically) for easily-overlooked negation characters. - -@item font-lock-warning-face -@vindex font-lock-warning-face -Used (typically) for constructs that are peculiar, or that greatly -change the meaning of other text. For example, this is used for -@samp{;;;###autoload} cookies in Emacs Lisp, and for @code{#error} -directives in C. +for easily-overlooked negation characters. @end table @node Syntactic Font Lock ------------------------------------------------------------ revno: 103084 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2011-02-02 21:50:21 +0200 message: lib-src/makefile.w32-in (obj): Remove strftime.o, it's not in src/. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-02-02 16:28:24 +0000 +++ lib-src/ChangeLog 2011-02-02 19:50:21 +0000 @@ -2,6 +2,7 @@ * makefile.w32-in (ETAGS_CFLAGS, CTAGS_CFLAGS): Add ``-DEMACS_NAME="\"GNU Emacs\""''. + (obj): Remove strftime.o. 2011-01-31 Eli Zaretskii === modified file 'lib-src/makefile.w32-in' --- lib-src/makefile.w32-in 2011-02-02 16:28:24 +0000 +++ lib-src/makefile.w32-in 2011-02-02 19:50:21 +0000 @@ -142,7 +142,7 @@ syntax.o bytecode.o \ process.o callproc.o unexw32.o \ region-cache.o sound.o atimer.o \ - doprnt.o strftime.o intervals.o textprop.o composite.o md5.o + doprnt.o intervals.o textprop.o composite.o md5.o # # These are the lisp files that are loaded up in loadup.el ------------------------------------------------------------ revno: 103083 committer: Sam Steingold branch nick: trunk timestamp: Wed 2011-02-02 12:59:44 -0500 message: * lisp/apropos.el (apropos-print): Now that `apropos-mode' inherits from `special-mode', entering it makes the buffer read-only, so call it only when everything has been already inserted. * lisp/emacs-lisp/ert.el (ert--setup-results-buffer) (ert-results-pop-to-backtrace-for-test-at-point) (ert-results-pop-to-messages-for-test-at-point) (ert-results-pop-to-timings): Ditto. * lisp/emacs-lisp/package.el (package--list-packages): Ditto. * lisp/play/solitaire.el (solitaire): Ditto. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-02 17:14:49 +0000 +++ lisp/ChangeLog 2011-02-02 17:59:44 +0000 @@ -1,3 +1,15 @@ +2011-02-02 Sam Steingold + + * apropos.el (apropos-print): Now that `apropos-mode' inherits + from `special-mode', entering it makes the buffer read-only, so + call it only when everything has been already inserted. + * emacs-lisp/ert.el (ert--setup-results-buffer) + (ert-results-pop-to-backtrace-for-test-at-point) + (ert-results-pop-to-messages-for-test-at-point) + (ert-results-pop-to-timings): Ditto. + * emacs-lisp/package.el (package--list-packages): Ditto. + * play/solitaire.el (solitaire): Ditto. + 2011-02-02 Chong Yidong * progmodes/compile.el: Make all faces inherit. === modified file 'lisp/apropos.el' --- lisp/apropos.el 2011-02-01 21:22:21 +0000 +++ lisp/apropos.el 2011-02-02 17:59:44 +0000 @@ -974,7 +974,6 @@ (old-buffer (current-buffer)) symbol item) (set-buffer standard-output) - (apropos-mode) (if (display-mouse-p) (insert "If moving the mouse over text changes the text's color, " @@ -1066,7 +1065,7 @@ (apropos-print-doc 4 'apropos-plist nil)) (set (make-local-variable 'truncate-partial-width-windows) t) (set (make-local-variable 'truncate-lines) t) - (setq buffer-read-only t)))) + (apropos-mode)))) (prog1 apropos-accumulator (setq apropos-accumulator ()))) ; permit gc === modified file 'lisp/emacs-lisp/ert.el' --- lisp/emacs-lisp/ert.el 2011-02-01 21:22:21 +0000 +++ lisp/emacs-lisp/ert.el 2011-02-02 17:59:44 +0000 @@ -1874,11 +1874,9 @@ (unless buffer-name (setq buffer-name "*ert*")) (let ((buffer (get-buffer-create buffer-name))) (with-current-buffer buffer - (setq buffer-read-only t) (let ((inhibit-read-only t)) (buffer-disable-undo) (erase-buffer) - (ert-results-mode) ;; Erase buffer again in case switching out of the previous ;; mode inserted anything. (This happens e.g. when switching ;; from ert-results-mode to ert-results-mode when @@ -1897,8 +1895,9 @@ (ewoc-enter-last ewoc (make-ert--ewoc-entry :test test :hidden-p t))) (ert--results-update-ewoc-hf ert--results-ewoc ert--results-stats) - (goto-char (1- (point-max))) - buffer))))) + (goto-char (1- (point-max))))) + (ert-results-mode) + buffer))) (defvar ert--selector-history nil @@ -2341,11 +2340,9 @@ (let ((backtrace (ert-test-result-with-condition-backtrace result)) (buffer (get-buffer-create "*ERT Backtrace*"))) (pop-to-buffer buffer) - (setq buffer-read-only t) (let ((inhibit-read-only t)) (buffer-disable-undo) (erase-buffer) - (ert-simple-view-mode) ;; Use unibyte because `debugger-setup-buffer' also does so. (set-buffer-multibyte nil) (setq truncate-lines t) @@ -2354,7 +2351,8 @@ (goto-char (point-min)) (insert "Backtrace for test `") (ert-insert-test-name-button (ert-test-name test)) - (insert "':\n"))))))) + (insert "':\n") + (ert-simple-view-mode))))))) (defun ert-results-pop-to-messages-for-test-at-point () "Display the part of the *Messages* buffer generated during the test at point. @@ -2367,16 +2365,15 @@ (result (aref (ert--stats-test-results stats) pos))) (let ((buffer (get-buffer-create "*ERT Messages*"))) (pop-to-buffer buffer) - (setq buffer-read-only t) (let ((inhibit-read-only t)) (buffer-disable-undo) (erase-buffer) - (ert-simple-view-mode) (insert (ert-test-result-messages result)) (goto-char (point-min)) (insert "Messages for test `") (ert-insert-test-name-button (ert-test-name test)) - (insert "':\n"))))) + (insert "':\n") + (ert-simple-view-mode))))) (defun ert-results-pop-to-should-forms-for-test-at-point () "Display the list of `should' forms executed during the test at point. @@ -2389,11 +2386,9 @@ (result (aref (ert--stats-test-results stats) pos))) (let ((buffer (get-buffer-create "*ERT list of should forms*"))) (pop-to-buffer buffer) - (setq buffer-read-only t) (let ((inhibit-read-only t)) (buffer-disable-undo) (erase-buffer) - (ert-simple-view-mode) (if (null (ert-test-result-should-forms result)) (insert "\n(No should forms during this test.)\n") (loop for form-description in (ert-test-result-should-forms result) @@ -2411,7 +2406,8 @@ (insert (concat "(Values are shallow copies and may have " "looked different during the test if they\n" "have been modified destructively.)\n")) - (forward-line 1))))) + (forward-line 1) + (ert-simple-view-mode))))) (defun ert-results-toggle-printer-limits-for-test-at-point () "Toggle how much of the condition to print for the test at point. @@ -2443,11 +2439,9 @@ (setq data (sort data (lambda (a b) (> (second a) (second b))))) (pop-to-buffer buffer) - (setq buffer-read-only t) (let ((inhibit-read-only t)) (buffer-disable-undo) (erase-buffer) - (ert-simple-view-mode) (if (null data) (insert "(No data)\n") (insert (format "%-3s %8s %8s\n" "" "time" "cumul")) @@ -2460,7 +2454,8 @@ (insert "\n")))) (goto-char (point-min)) (insert "Tests by run time (seconds):\n\n") - (forward-line 1)))) + (forward-line 1) + (ert-simple-view-mode)))) ;;;###autoload (defun ert-describe-test (test-or-test-name) === modified file 'lisp/emacs-lisp/package.el' --- lisp/emacs-lisp/package.el 2011-02-01 21:22:21 +0000 +++ lisp/emacs-lisp/package.el 2011-02-02 17:59:44 +0000 @@ -1658,10 +1658,10 @@ (require 'finder-inf nil t) (let ((buf (get-buffer-create "*Packages*"))) (with-current-buffer buf - (package-menu-mode) (set (make-local-variable 'package-menu-package-list) packages) (set (make-local-variable 'package-menu-sort-key) nil) - (package--generate-package-list)) + (package--generate-package-list) + (package-menu-mode)) ;; The package menu buffer has keybindings. If the user types ;; `M-x list-packages', that suggests it should become current. (switch-to-buffer buf))) === modified file 'lisp/play/solitaire.el' --- lisp/play/solitaire.el 2011-02-01 21:22:21 +0000 +++ lisp/play/solitaire.el 2011-02-02 17:59:44 +0000 @@ -188,7 +188,6 @@ (interactive "P") (switch-to-buffer "*Solitaire*") - (solitaire-mode) (setq buffer-read-only t) (setq solitaire-stones 32) (solitaire-insert-board) @@ -196,7 +195,7 @@ (goto-char (point-max)) (setq solitaire-center (search-backward ".")) (setq buffer-undo-list (list (point))) - (set-buffer-modified-p nil)) + (solitaire-mode)) (defun solitaire-build-modeline () (setq mode-line-format ------------------------------------------------------------ revno: 103082 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-02-02 12:26:04 -0500 message: * etc/themes/tango-theme.el: Remove some non-Tango face colors. diff: === modified file 'etc/themes/tango-theme.el' --- etc/themes/tango-theme.el 2011-01-25 04:08:28 +0000 +++ etc/themes/tango-theme.el 2011-02-02 17:26:04 +0000 @@ -42,20 +42,20 @@ (plum-1 "#ad7fa8") (plum-2 "#75507b") (plum-3 "#5c3566") (red-1 "#ef2929") (red-2 "#cc0000") (red-3 "#a40000") (alum-1 "#eeeeec") (alum-2 "#d3d7cf") (alum-3 "#babdb6") - (alum-4 "#888a85") (alum-5 "#555753") (alum-6 "#2e3436") + (alum-4 "#888a85") (alum-5 "#5f615c") (alum-6 "#2e3436") ;; Not in Tango palette; used for better contrast. - (cham-4 "#346604") (blue-0 "#8cc4ff")) + (cham-4 "#346604") (blue-0 "#8cc4ff") (orange-4 "#b35000")) (custom-theme-set-faces 'tango - `(default ((,class (:foreground ,"#16191a" :background ,alum-1)))) + `(default ((,class (:foreground ,alum-6 :background ,alum-1)))) `(cursor ((,class (:foreground ,alum-1 :background ,blue-3)))) ;; Highlighting faces `(fringe ((,class (:background ,alum-2)))) `(highlight ((,class (:background ,alum-3)))) `(region ((,class (:background ,alum-3)))) `(secondary-selection ((,class (:background ,blue-0)))) - `(isearch ((,class (:foreground ,"#ffffff" :background ,orange-3)))) + `(isearch ((,class (:foreground "#ffffff" :background ,orange-3)))) `(lazy-highlight ((,class (:background ,choc-1)))) `(trailing-whitespace ((,class (:background ,red-1)))) ;; Mode line faces @@ -67,14 +67,14 @@ `(minibuffer-prompt ((,class (:weight bold :foreground ,blue-3)))) `(escape-glyph ((,class (:foreground ,red-3)))) ;; Font lock faces - `(font-lock-builtin-face ((,class (:weight bold :foreground ,plum-3)))) - `(font-lock-comment-face ((,class (:foreground ,cham-4)))) + `(font-lock-builtin-face ((,class (:foreground ,plum-2)))) + `(font-lock-comment-face ((,class (:slant italic :foreground ,alum-5)))) `(font-lock-constant-face ((,class (:weight bold :foreground ,blue-3)))) `(font-lock-function-name-face ((,class (:foreground ,red-3)))) - `(font-lock-keyword-face ((,class (:weight bold :foreground ,choc-2)))) + `(font-lock-keyword-face ((,class (:foreground ,cham-4)))) `(font-lock-string-face ((,class (:foreground ,plum-3)))) `(font-lock-type-face ((,class (:foreground ,blue-3)))) - `(font-lock-variable-name-face ((,class (:weight bold :foreground ,orange-3)))) + `(font-lock-variable-name-face ((,class (:foreground ,orange-4)))) `(font-lock-warning-face ((,class (:foreground ,red-2)))) ;; Button and link faces `(button ((,class (:underline t :foreground ,blue-3)))) @@ -85,32 +85,32 @@ `(gnus-group-news-1-low ((,class (:foreground ,plum-3)))) `(gnus-group-news-2 ((,class (:weight bold :foreground ,blue-3)))) `(gnus-group-news-2-low ((,class (:foreground ,blue-3)))) - `(gnus-group-news-3 ((,class (:weight bold :foreground ,"#4e0a06")))) - `(gnus-group-news-3-low ((,class (:foreground ,"#4e0a06")))) + `(gnus-group-news-3 ((,class (:weight bold :foreground ,red-3)))) + `(gnus-group-news-3-low ((,class (:foreground ,red-3)))) `(gnus-group-news-4 ((,class (:weight bold :foreground ,"#7a4c02")))) `(gnus-group-news-4-low ((,class (:foreground ,"#7a4c02")))) `(gnus-group-news-5 ((,class (:weight bold :foreground ,orange-3)))) `(gnus-group-news-5-low ((,class (:foreground ,orange-3)))) - `(gnus-group-news-low ((,class (:foreground ,"#888a85")))) + `(gnus-group-news-low ((,class (:foreground ,alum-4)))) `(gnus-group-mail-1 ((,class (:weight bold :foreground ,plum-3)))) `(gnus-group-mail-1-low ((,class (:foreground ,plum-3)))) `(gnus-group-mail-2 ((,class (:weight bold :foreground ,blue-3)))) `(gnus-group-mail-2-low ((,class (:foreground ,blue-3)))) - `(gnus-group-mail-3 ((,class (:weight bold :foreground ,"#4e0a06")))) - `(gnus-group-mail-3-low ((,class (:foreground ,"#4e0a06")))) - `(gnus-group-mail-low ((,class (:foreground ,"#888a85")))) + `(gnus-group-mail-3 ((,class (:weight bold :foreground ,cham-3)))) + `(gnus-group-mail-3-low ((,class (:foreground ,cham-3)))) + `(gnus-group-mail-low ((,class (:foreground ,alum-4)))) `(gnus-header-content ((,class (:foreground ,cham-3)))) `(gnus-header-from ((,class (:weight bold :foreground ,butter-3)))) - `(gnus-header-subject ((,class (:foreground ,"#4e0a06")))) + `(gnus-header-subject ((,class (:foreground ,red-3)))) `(gnus-header-name ((,class (:foreground ,blue-3)))) - `(gnus-header-newsgroups ((,class (:foreground ,"#888a85")))) + `(gnus-header-newsgroups ((,class (:foreground ,alum-4)))) ;; Message faces `(message-header-name ((,class (:foreground ,blue-3)))) `(message-header-cc ((,class (:foreground ,butter-3)))) `(message-header-other ((,class (:foreground ,choc-2)))) - `(message-header-subject ((,class (:foreground ,"#4e0a06")))) + `(message-header-subject ((,class (:foreground ,red-3)))) `(message-header-to ((,class (:weight bold :foreground ,butter-3)))) - `(message-cited-text ((,class (:foreground ,"#888a85")))) + `(message-cited-text ((,class (:slant italic :foreground ,alum-5)))) `(message-separator ((,class (:weight bold :foreground ,cham-3)))) ;; SMerge `(smerge-refined-change ((,class (:background ,plum-1)))) ------------------------------------------------------------ revno: 103081 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-02-02 12:14:49 -0500 message: * progmodes/compile.el: Make all faces inherit from font-lock faces. (compilation-warning): Inherit from font-lock-variable-name-face. (compilation-info): Inherit from font-lock-type-face. (compilation-line-number): Reassign to font-lock-keyword-face. (compilation-column-number): Reassign to font-lock-doc-face. (compilation-leave-directory-face): Reassign to font-lock-builtin-face. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-02 16:21:52 +0000 +++ lisp/ChangeLog 2011-02-02 17:14:49 +0000 @@ -1,3 +1,13 @@ +2011-02-02 Chong Yidong + + * progmodes/compile.el: Make all faces inherit. + (compilation-warning): Inherit from font-lock-variable-name-face. + (compilation-info): Inherit from font-lock-type-face. + (compilation-line-number): Reassign to font-lock-keyword-face. + (compilation-column-number): Reassign to font-lock-doc-face. + (compilation-leave-directory-face): Reassign to + font-lock-builtin-face. + 2011-02-02 Eli Zaretskii * dired.el (dired-insert-directory): Don't invoke `ls' when === modified file 'lisp/progmodes/compile.el' --- lisp/progmodes/compile.el 2011-02-01 21:22:21 +0000 +++ lisp/progmodes/compile.el 2011-02-02 17:14:49 +0000 @@ -633,34 +633,25 @@ :version "22.1") (defface compilation-warning - '((((class color) (min-colors 16)) (:foreground "Orange" :weight bold)) - (((class color)) (:foreground "cyan" :weight bold)) - (t (:weight bold))) + '((t :inherit font-lock-variable-name-face)) "Face used to highlight compiler warnings." :group 'compilation :version "22.1") (defface compilation-info - '((((class color) (min-colors 16) (background light)) - (:foreground "Green3" :weight bold)) - (((class color) (min-colors 88) (background dark)) - (:foreground "Green1" :weight bold)) - (((class color) (min-colors 16) (background dark)) - (:foreground "Green" :weight bold)) - (((class color)) (:foreground "green" :weight bold)) - (t (:weight bold))) + '((t :inherit font-lock-type-face)) "Face used to highlight compiler information." :group 'compilation :version "22.1") (defface compilation-line-number - '((t :inherit font-lock-variable-name-face)) + '((t :inherit font-lock-keyword-face)) "Face for displaying line numbers in compiler messages." :group 'compilation :version "22.1") (defface compilation-column-number - '((t :inherit font-lock-type-face)) + '((t :inherit font-lock-doc-face)) "Face for displaying column numbers in compiler messages." :group 'compilation :version "22.1") @@ -693,7 +684,7 @@ (defvar compilation-enter-directory-face 'font-lock-function-name-face "Face name to use for entering directory messages.") -(defvar compilation-leave-directory-face 'font-lock-type-face +(defvar compilation-leave-directory-face 'font-lock-builtin-face "Face name to use for leaving directory messages.") ------------------------------------------------------------ revno: 103080 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2011-02-02 18:28:24 +0200 message: Make "etags --version" on Windows produce the same as on Posix platforms. makefile.w32-in (ETAGS_CFLAGS, CTAGS_CFLAGS): Add ``-DEMACS_NAME="\"GNU Emacs\""''. diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-01-31 23:54:50 +0000 +++ lib-src/ChangeLog 2011-02-02 16:28:24 +0000 @@ -1,3 +1,8 @@ +2011-02-02 Eli Zaretskii + + * makefile.w32-in (ETAGS_CFLAGS, CTAGS_CFLAGS): Add + ``-DEMACS_NAME="\"GNU Emacs\""''. + 2011-01-31 Eli Zaretskii * makefile.w32-in (VERSION): Don't define, defined on nt/config.nt. === modified file 'lib-src/makefile.w32-in' --- lib-src/makefile.w32-in 2011-01-31 19:36:08 +0000 +++ lib-src/makefile.w32-in 2011-02-02 16:28:24 +0000 @@ -98,7 +98,7 @@ $(CC) $(CFLAGS) -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \ ../src/regex.c $(CC_OUT)$@ -ETAGS_CFLAGS = -DHAVE_GETCWD +ETAGS_CFLAGS = -DHAVE_GETCWD -DEMACS_NAME="\"GNU Emacs\"" $(BLD)/etags.$(O): etags.c $(CC) $(CFLAGS) $(ETAGS_CFLAGS) $(CC_OUT)$@ etags.c @@ -114,7 +114,7 @@ - $(DEL) ctags.c $(CP) etags.c ctags.c -CTAGS_CFLAGS = -DCTAGS $(ETAGS_CFLAGS) +CTAGS_CFLAGS = -DCTAGS $(ETAGS_CFLAGS) -DEMACS_NAME="\"GNU Emacs\"" $(BLD)/ctags.$(O): ctags.c $(CC) $(CFLAGS) $(CTAGS_CFLAGS) $(CC_OUT)$@ ctags.c ------------------------------------------------------------ revno: 103079 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2011-02-02 18:21:52 +0200 message: Fix Dired on DOS/Windows. dired.el (dired-insert-directory): Don't invoke `ls' when ls-lisp.el is used to emulate it. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-02-01 23:46:27 +0000 +++ lisp/ChangeLog 2011-02-02 16:21:52 +0000 @@ -1,3 +1,8 @@ +2011-02-02 Eli Zaretskii + + * dired.el (dired-insert-directory): Don't invoke `ls' when + ls-lisp.el is used to emulate it. + 2011-02-01 Julien Danjou * color.el (color-gradient): Add a color-gradient function. === modified file 'lisp/dired.el' --- lisp/dired.el 2011-02-01 21:22:21 +0000 +++ lisp/dired.el 2011-02-02 16:21:52 +0000 @@ -1052,6 +1052,8 @@ (set-marker file nil))))) +(defvar ls-lisp-use-insert-directory-program) + (defun dired-insert-directory (dir switches &optional file-list wildcard hdr) "Insert a directory listing of DIR, Dired style. Use SWITCHES to make the listings. @@ -1063,14 +1065,20 @@ (let ((opoint (point)) (process-environment (copy-sequence process-environment)) end) - (if (or (if (eq dired-use-ls-dired 'unspecified) - ;; Check whether "ls --dired" gives exit code 0, and - ;; save the answer in `dired-use-ls-dired'. - (setq dired-use-ls-dired - (eq (call-process insert-directory-program nil nil nil "--dired") - 0)) - dired-use-ls-dired) - (file-remote-p dir)) + (if (and + ;; Don't try to invoke `ls' if we are on DOS/Windows where + ;; ls-lisp emulation is used, except if they want to use `ls' + ;; as indicated by `ls-lisp-use-insert-directory-program'. + (not (and (featurep 'ls-lisp) + (null ls-lisp-use-insert-directory-program))) + (or (if (eq dired-use-ls-dired 'unspecified) + ;; Check whether "ls --dired" gives exit code 0, and + ;; save the answer in `dired-use-ls-dired'. + (setq dired-use-ls-dired + (eq (call-process insert-directory-program nil nil nil "--dired") + 0)) + dired-use-ls-dired) + (file-remote-p dir))) (setq switches (concat "--dired " switches))) ;; We used to specify the C locale here, to force English month names; ;; but this should not be necessary any more, ------------------------------------------------------------ revno: 103078 committer: Chong Yidong branch nick: trunk timestamp: Tue 2011-02-01 22:36:29 -0500 message: etc/themes/wheatgrass-theme.el: Apply min-colors setting to face definitions. diff: === modified file 'etc/themes/wheatgrass-theme.el' --- etc/themes/wheatgrass-theme.el 2011-01-25 04:08:28 +0000 +++ etc/themes/wheatgrass-theme.el 2011-02-02 03:36:29 +0000 @@ -20,42 +20,50 @@ ;;; Code: (deftheme wheatgrass - "Theme for basic, Font Lock, Isearch, Gnus, and Message faces. -The default face is wheat on a black background. Other faces -are in shades of green, brown, and blue.") + "A high-contrast theme with a black background. +Basic, Font Lock, Isearch, Gnus, and Message faces are included. +The default face foreground is wheat, with other faces in shades +of green, brown, and blue.") -(custom-theme-set-faces - 'wheatgrass - '(default ((t (:foreground "wheat" :background "black")))) - '(cursor ((t (:foreground "black" :background "thistle")))) - '(highlight ((t (:foreground "white" :background "dark green")))) - '(region ((t (:foreground "white" :background "dark green")))) - '(font-lock-builtin-face ((t (:foreground "LightSteelBlue")))) - '(font-lock-comment-face ((t (:foreground "SpringGreen3")))) - '(font-lock-constant-face ((t (:foreground "turquoise")))) - '(font-lock-function-name-face ((t (:foreground "pale green")))) - '(font-lock-keyword-face ((t (:foreground "white")))) - '(font-lock-string-face ((t (:foreground "dark khaki")))) - '(font-lock-type-face ((t (:foreground "aquamarine")))) - '(font-lock-variable-name-face ((t (:foreground "yellow green")))) - '(font-lock-warning-face ((t (:foreground "salmon1")))) - '(button ((t (:underline t :foreground "cyan")))) - '(link ((t (:underline t :foreground "cyan")))) - '(link-visited ((t (:underline t :foreground "dark cyan")))) - '(isearch ((t (:foreground "white" :background "dark goldenrod")))) - '(lazy-highlight ((t (:background "gray25")))) - '(gnus-header-content ((t (:weight normal :foreground "yellow green")))) - '(gnus-header-from ((t (:foreground "pale green")))) - '(gnus-header-subject ((t (:foreground "pale turquoise")))) - '(gnus-header-name ((t (:foreground "dark sea green")))) - '(gnus-header-newsgroups ((t (:foreground "dark khaki")))) - '(message-header-name ((t (:foreground "dark turquoise")))) - '(message-header-cc ((t (:foreground "yellow green")))) - '(message-header-other ((t (:foreground "dark khaki")))) - '(message-header-subject ((t (:foreground "pale turquoise")))) - '(message-header-to ((t (:foreground "pale green")))) - '(message-cited-text ((t (:foreground "SpringGreen3")))) - '(message-separator ((t (:foreground "deep sky blue"))))) +(let ((class '((class color) (min-colors 89)))) + (custom-theme-set-faces + 'wheatgrass + `(default ((,class (:foreground "wheat" :background "black")))) + `(cursor ((,class (:foreground "black" :background "thistle")))) + ;; Highlighting faces + `(highlight ((,class (:foreground "white" :background "dark green")))) + `(region ((,class (:foreground "white" :background "dark green")))) + `(secondary-selection ((,class (:background "dark slate gray")))) + `(isearch ((,class (:foreground "white" :background "dark goldenrod")))) + `(lazy-highlight ((,class (:background "gray25")))) + ;; Font lock faces + `(font-lock-builtin-face ((,class (:foreground "LightSteelBlue")))) + `(font-lock-comment-face ((,class (:foreground "SpringGreen3")))) + `(font-lock-constant-face ((,class (:foreground "turquoise")))) + `(font-lock-function-name-face ((,class (:foreground "pale green")))) + `(font-lock-keyword-face ((,class (:foreground "white")))) + `(font-lock-string-face ((,class (:foreground "dark khaki")))) + `(font-lock-type-face ((,class (:foreground "aquamarine")))) + `(font-lock-variable-name-face ((,class (:foreground "yellow green")))) + `(font-lock-warning-face ((,class (:foreground "salmon1")))) + ;; Button and link faces + `(button ((,class (:underline t :foreground "cyan")))) + `(link ((,class (:underline t :foreground "cyan")))) + `(link-visited ((,class (:underline t :foreground "dark cyan")))) + ;; Gnus faces + `(gnus-header-content ((,class (:weight normal :foreground "yellow green")))) + `(gnus-header-from ((,class (:foreground "pale green")))) + `(gnus-header-subject ((,class (:foreground "pale turquoise")))) + `(gnus-header-name ((,class (:foreground "dark sea green")))) + `(gnus-header-newsgroups ((,class (:foreground "dark khaki")))) + ;; Message faces + `(message-header-name ((,class (:foreground "dark turquoise")))) + `(message-header-cc ((,class (:foreground "yellow green")))) + `(message-header-other ((,class (:foreground "dark khaki")))) + `(message-header-subject ((,class (:foreground "pale turquoise")))) + `(message-header-to ((,class (:foreground "pale green")))) + `(message-cited-text ((,class (:foreground "SpringGreen3")))) + `(message-separator ((,class (:foreground "deep sky blue")))))) (provide-theme 'wheatgrass)