Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 101947. ------------------------------------------------------------ revno: 101947 committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2010-10-13 05:39:17 +0000 message: gnus-dired.el (gnus-dired-attach): Silence XEmacs 21.5 when compiling. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-13 02:19:11 +0000 +++ lisp/gnus/ChangeLog 2010-10-13 05:39:17 +0000 @@ -1,5 +1,7 @@ 2010-10-13 Katsumi Yamaoka + * gnus-dired.el (gnus-dired-attach): Silence XEmacs 21.5 when compiling. + * gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist. (gnus-treat-from-gravatar, gnus-treat-mail-gravatar): Force displaying === modified file 'lisp/gnus/gnus-dired.el' --- lisp/gnus/gnus-dired.el 2010-09-30 08:39:23 +0000 +++ lisp/gnus/gnus-dired.el 2010-10-13 05:39:17 +0000 @@ -133,7 +133,9 @@ (mapcar ;; don't attach directories (lambda (f) (if (file-directory-p f) nil f)) - (nreverse (dired-map-over-marks (dired-get-filename) nil)))))) + (nreverse + (let ((arg nil)) ;; Silence XEmacs 21.5 when compiling. + (dired-map-over-marks (dired-get-filename) arg))))))) (let ((destination nil) (files-str nil) (bufs nil)) ------------------------------------------------------------ revno: 101946 author: IRIE Shinsuke committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-12 20:30:36 -0700 message: * lisp/subr.el (last): Make it faster. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-13 03:23:47 +0000 +++ lisp/ChangeLog 2010-10-13 03:30:36 +0000 @@ -1,3 +1,7 @@ +2010-10-13 IRIE Shinsuke (tiny change) + + * subr.el (last): Make it faster. (Bug#7174) + 2010-10-13 Rainer Orth (tiny change) * Makefile.in (compile-clean): Use `` instead of $(). (Bug#7178) === modified file 'lisp/subr.el' --- lisp/subr.el 2010-10-03 21:23:13 +0000 +++ lisp/subr.el 2010-10-13 03:30:36 +0000 @@ -289,14 +289,11 @@ If N is non-nil, return the Nth-to-last link of LIST. If N is bigger than the length of LIST, return LIST." (if n - (let ((m 0) (p list)) - (while (consp p) - (setq m (1+ m) p (cdr p))) - (if (<= n 0) p - (if (< n m) (nthcdr (- m n) list) list))) - (while (consp (cdr list)) - (setq list (cdr list))) - list)) + (and (> n 0) + (let ((m (length list))) + (if (< n m) (nthcdr (- m n) list) list))) + (and list + (nthcdr (1- (length list)) list)))) (defun butlast (list &optional n) "Return a copy of LIST with the last N elements removed." ------------------------------------------------------------ revno: 101945 author: Rainer Orth committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-12 20:23:47 -0700 message: * lisp/Makefile.in (compile-clean): Use `` instead of $(). (Former is more portable than the latter.) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-12 20:06:20 +0000 +++ lisp/ChangeLog 2010-10-13 03:23:47 +0000 @@ -1,3 +1,7 @@ +2010-10-13 Rainer Orth (tiny change) + + * Makefile.in (compile-clean): Use `` instead of $(). (Bug#7178) + 2010-10-12 Chong Yidong * cus-theme.el (custom-theme--listed-faces): Add cursor face. === modified file 'lisp/Makefile.in' --- lisp/Makefile.in 2010-10-11 23:57:49 +0000 +++ lisp/Makefile.in 2010-10-13 03:23:47 +0000 @@ -249,7 +249,7 @@ compile-clean: @cd $(lisp); $(setwins); \ elcs=`echo "$$wins " | sed -e 's|/\./|/|g' -e 's|/\. | |g' -e 's| |/*.elc |g'`; \ - for el in $$(echo $$elcs | sed -e 's/\.elc/\.el/g'); do \ + for el in `echo $$elcs | sed -e 's/\.elc/\.el/g'`; do \ if test -f "$$el" -o \! -f "$${el}c"; then :; else \ echo rm "$${el}c"; \ rm "$${el}c"; \ ------------------------------------------------------------ revno: 101944 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-12 20:17:59 -0700 message: Tidy some nextstep README etc files. * nextstep/README: Move historical information to new file ../etc/NEXTSTEP. * nextstep/AUTHORS: Merge into ./etc/NEXTSTEP and remove file. * etc/NEXTSTEP: New file, extracted from ../nextstep/{AUTHORS,README}. * make-dist: No more nextstep/AUTHORS. diff: === modified file 'etc/ChangeLog' --- etc/ChangeLog 2010-10-12 04:01:55 +0000 +++ etc/ChangeLog 2010-10-13 03:17:59 +0000 @@ -1,3 +1,7 @@ +2010-10-13 Glenn Morris + + * NEXTSTEP: New file, extracted from ../nextstep/{AUTHORS,README}. + 2010-10-12 Glenn Morris * TODO: Merge ../nextstep/FOR-RELEASE into this file. === added file 'etc/NEXTSTEP' --- etc/NEXTSTEP 1970-01-01 00:00:00 +0000 +++ etc/NEXTSTEP 2010-10-13 03:17:59 +0000 @@ -0,0 +1,311 @@ +Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. +See the end of the file for license conditions. + +This file contains information about GNU Emacs on "Nextstep" platforms. +The Nextstep support code works on many POSIX systems (and possibly +W32) using the GNUstep libraries, and on MacOS X systems using the +Cocoa libraries. + +Background +---------- +Within Emacs, the port and its code are referred to using the term +"Nextstep", despite the fact that no system or API has been released +under this name in more than 10 years. Here's some background on why: + +NeXT, Inc. introduced the NeXTstep API with its computer and operating +system in the late 1980's. Later on, in collaboration with Sun, this +API was published as a specification called OpenStep. The GNUstep +project started in the early 1990's to provide a free implementation +of this API. Later on, Apple bought NeXT (some would say "NeXT bought +Apple") and made OpenStep the basis of OS X, calling the API "Cocoa". +Since then, Cocoa has evolved beyond the OpenStep specification, and +GNUstep has followed it. + +Thus, calling this port "OpenStep" is not technically accurate, and in +the absence of any other determinant, we are using the term +"Nextstep", both because it signifies the original inspiration that +created these APIs, and because all of the classes and functions still +begin with the letters "NS". + +(See http://en.wikipedia.org/wiki/Nextstep) + +This Emacs port was first released in the early 1990's on the NeXT +computer, and was successively updated to OpenStep, Rhapsody, OS X, +and then finally GNUstep, tracking GNU emacs core releases in the +meantime. + + +Release History +--------------- + +1990-1992 1.0-3.0 (?) Michael Brouwer's socket/terminal communication + based version (GUI ran as a separate process.) + +1993/10/25 3.0.1 Last (?) release of Brouwer version. Supports + NeXTstep 3.x and below. + +1994/04/24 4.0 Carl Edman's version using direct API following + the X-Windows port. NeXTstep 3.x only. + +1995/06/15 4.1 Second (and last) Carl Edman release, based on + Emacs 19.28. + +1996/07/28 4.2 First Christian Limpach release, based on + Emacs 19.29. + +?? 5.0 ?? + +1997/12/?? 6.0b1 Ported to OpenStep by Scott Bender. Updated + to Emacs 20.2. + +?? 6.0b2 (?) Scott Bender: ported to Rhapsody. + +1999/05/?? 6.0b3 Scott Bender: "OS X Server", Emacs 20.3. + +2001/06/25 7.0 Ported to MacOS X (10.1) by Christophe de + Dinechin. Release based on Emacs 20.7. Hosting + moved to SourceForge. + +2002/01/03 7.0.1 Bug fixes. + +2002/08/27 7.0.2 Jaguar (OS X 10.2) support. Added an autoconf + option for sys_nerr being in stdio. Added + libncurses to the build libraries. Fixed a + problem with ns-alternate-is-meta. Changed the + icon color to blue, since Jaguar is yellow. + +2004/10/07 8.0-pre1 Ported to GNUstep by Adrian Robert. + +2004/11/04 8.0-pre2 Restored functionality on OS X (menu code + cleanup). Improved scrollbar handling and + paste from other applications. File icons + obtained properly from NSWorkspace. Dropped + Gorm and Nib files. Background refresh bug + fixed (in GNUstep). Various small fixes and + code cleanups. Now starts up under Art. + +2005/01/27 8.0-pre3 Bold and italic faces supported. Cursor and + mouse highlighting rendering bugs + fixed. Drag/drop and cut/paste interaction + w/external apps fixed. File load/save panels + available. Stability and rendering speed + improvements. Some ObjC and VC mode bugs fixed. + +2005/02/27 8.0-rc1 Dynamic path detection at startup so Emacs.app + can be moved anywhere. Added binary packages + and simplified source installation to running + two scripts. Thorough cleanup of menu code; + now fully functional. Fixed all detected + memory leaks. Minor frame focus and title + bugs fixed. + +2005/03/30 8.0-rc2 "Configure" info directory now uses dynamic + path setting, so info files can go under .app. + Improved select() handling and PTY fixes so + shell mode and tramp run smoothly. + Significant rendering optimizations under + GNUstep, and now works under Art backend. + Non-Latin text rendering works (but not + fontsets), and LEIM is bundled. UTF8 is used + for clipboard interaction. + Arrow cursor now used on scrollbar. + objc-mode and tramp now bundled in site-lisp. + +2005/05/30 8.0-rc3 Fixed bug with parsing of "easymenu" menus. + Many problems with modes such as SLIME, MatLab, + and Planner go away. Improved scrollbar + handling and rendering speed. Color panel + and other bug fixes. mac-fix-env utility. + Font handling improvements (OS X 10.3, 10.4): + - heed 'GSFontAntiAlias' default + - heed system antialiasing threshold + - added 'UseQuickdrawSmoothing' default to + invoke less heavy antialiasing + +2005/07/05 8.0-rc4 Added a Preferences panel. Cleaned up + rendering for synthetic italic fonts. Further + improved menu parsing. Use system highlight + color. Added previous- and next-mark history + navigation commmands bound to M-p,M-n. + Miscellaneous bug fixes. + +2005/08/04 8.0-rc5 All internal string handling changed to UTF-8. + This means menu items, color and color list + names, and a few other things will now display + properly. It does NOT mean UTF-8 filenames + are displayed correctly in the minibuffer. + Also relating to UTF-8, contents of files + using this coding can now be displayed (though + not auto-recognized; add extensions to your + default coding alist). Limited mac-roman + support was also added (also sans recognition). + Certain characters are not displayed properly + due to a translation problem. (UTF-8 based on + work by Otfried Cheong; mac-roman from + emacs-21.) Partial support for "dead-key" + handling now added. Transparency (e.g., M-x + set-background-color ARGB88FFFFFF) improved: + only the background is made transparent. + Cursor drawing glitches fixed. Preferences + handling improved. Fixed some portability + problems on Tiger and Puma. + +2005/09/12 8.0 Bundled ispell on OS X. Minor bug fixes and + stability improvements. Compiles under gcc-4. + +2005/09/26 8.0.1 Correct clipped rendering for synthetic + italics. Include the info directory. + Fix grabenv. Bundle whitespace package. + +2005/10/27 8.0.2 Correct rendering for wide characters during + cursor movement. Fix bungled hack in ispell + bundling. + +2005/11/05 9.0-pre1 Updated to latest Emacs CVS code on unicode-2 + branch (proposed to be released 2006/2007 as + Emacs 23). + +2005/11/11 9.0-pre2 Fix crashes for deiconifying and loading + certain images. Improve vertical font metrics + (fixes inaccurate page up/down, window size, + and partial lines). Support better remapping + of Alt/Opt and remapping of Command. More + insistent defaulting of scrollbar to right. + Modest improvements to build process. + +2006/04/22 9.0-pre2a Stopgap interim release to sync w/latest + unicode-2 CVS. Includes XPM and partial + toolbar support. + +2006/06/08 9.0-pre3 Major upgrade to keyboard handling: + system-selected compositional input methods + should now work, as well as more keys / + keyboards. XPM, toolbar, and tooltip support. + Some improvements to scrollbars, zoom, italic + rendering, pasting, Color panel. Added function + ns-set-background-alpha to work around + inability to customize with numeric colors. + +2006/12/24 9.0-rc1 Reworked font handling and text rendering to + use Kenichi Handa's new font back-end system. + Font sets are now supported and automatically + created when a font is selected. Added recent + X11 colors to Emacs.clr (remove + ~/Library/Colors/Emacs.clr to pick up). Added + ns-option-modifier, ns-control-modifier, + ns-function-modifier customization variables. + Update menus to Emacs 21+ conventions. Right + mouse button now generates mouse-3 events. + Various bug fixes and rendering improvements. + +2007/09/10 9.0-rc2 Improve menubar, popup menu, and scrollbar + behavior, let accented char entry work in + isearch, follow system keymap for shortcut + keys, fix border and box drawing, remove + glitches in modeline drawing, support + overstrike for unavailable bold fonts, fix XPM + related crasher bugs. Incremental font + metrics caching and other performance + improvements. Shared-lisp builds now possible. + +2007/09/20 9.0-rc2a Interim release. New features: composed + character display, colored fringe bitmaps, + colored relief drawing, dynamic resizing, + Bug fixes: popup menu position and selection, + font width calculation, face color adaptation + to background, submenu keyboard navigation. + NOT TESTED ON GNUSTEP. + +2007/11/19 9.0-rc3 Integrated the multi-TTY functionality from + emacs core (however, mixed TTY and GUI + sessions are not working yet). Support 10.5. + Give site-lisp load precedence over lisp and + add a compile option to prefer an additional + directory, use miniaturized miniwindow images + in some cases, rename cursor types for + consistency w/other emacs terms, improved font + selection for symbol scripts. + Bug fixes: fringe and bitmap, frame deletion, + resizing, cursor blink, workspace open-file, + image backgrounds, toolbar item enablement, + context menu positioning. + +2008/07/15 (none) Merge to GNU Emacs CVS trunk. + + +Contributors +------------ +In addition to the folks listed in etc/AUTHORS responsible for GNU Emacs +itself, the NeXTstep port owes to the following people: + +Carl Edman + original author and maintainer, mainly UI +Michael Brouwer + heavy contributor, input handling and other areas +Christian Limpach + help / maintenance on NeXTstep +Scott Bender + OpenStep, Rhapsody ports +Christophe de Dinechin + MacOS X port +Adrian Robert + GNUstep port, update Emacs 20 -> 21+ + +Joe Reiss + popup menu, dialog boxes; icons +Andrew Athan + font panel integration +Scott Byer + improved rendering code +Scott Hess + keyboard handling suggestions + +Rahul Abrol + "hide others" patch +Adam Ratcliffe + preferences panel documentation +Peter Dyballa + assistance with non-ASCII rendering and keyboard handling +David M. Cooke + fix to XPM crash bug +Carsten Bormann + initial patch and assistance getting dired working for non-ASCII filenames +Andrew Moore + assistance on ns-mark-nav extension + +The GNUstep port was made possible through the assistance of Adam +Fedor, Fred Kiefer, M. Uli Klusterer, Alexander Malmberg, Jonas +Matton, and Riccardo Mottola. Leigh Smith maintained the SourceForge +project for a period. + +Suggestions from Darcy Brockbank, Timothy Bissell, Scott Byer, David +Griffiths, Scott Hess, Eberhard Mandler, John C. Randolph, and Bradley +Taylor all helped things along at one point or another. Axel Seibert +and Paul J. Sanchez offered their time and machines to make a +binary release possible. + +We would also like to thank a number of people who kept up the +constant supply of bug reports, suggested features and praise: Hardy +Mayer, Gisli Ottarsson, Anthony Heading, David Bau, Jamie Zawinski, +Martin Moncrieffe, Simson L. Garfinkel, Richard Stallman, Stephen +Anderson, Ivo Welch, Magnus Nordborg, Tom Epperly, Andreas Koenig, +Yves Arrouye, Anil Somayaji, Gregor Hoffleit; and the few hundred +other people on the mailing list from whom we didn't hear much, but +the presence of which assured us that maybe this project was actually +worth doing. + + +This file is part of GNU Emacs. + +GNU Emacs is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +GNU Emacs is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with GNU Emacs. If not, see . === modified file 'make-dist' --- make-dist 2010-10-13 03:08:45 +0000 +++ make-dist 2010-10-13 03:17:59 +0000 @@ -425,7 +425,7 @@ echo "Making links to \`nextstep'" (cd nextstep - ln AUTHORS ChangeLog README INSTALL ../${tempdir}/nextstep) + ln ChangeLog README INSTALL ../${tempdir}/nextstep) echo "Making links to \`nextstep/Cocoa/Emacs.base/Contents'" (cd nextstep/Cocoa/Emacs.base/Contents === removed file 'nextstep/AUTHORS' --- nextstep/AUTHORS 2010-10-13 03:11:08 +0000 +++ nextstep/AUTHORS 1970-01-01 00:00:00 +0000 @@ -1,58 +0,0 @@ -In addition to the folks listed in etc/AUTHORS responsible for GNU Emacs -itself, the NeXTstep port owes to the following people: - -Carl Edman - original author and maintainer, mainly UI -Michael Brouwer - heavy contributor, input handling and other areas -Christian Limpach - help / maintenance on NeXTstep -Scott Bender - OpenStep, Rhapsody ports -Christophe de Dinechin - MacOS X port -Adrian Robert - GNUstep port, update Emacs 20 -> 21+ - -Joe Reiss - popup menu, dialog boxes; icons -Andrew Athan - font panel integration -Scott Byer - improved rendering code -Scott Hess - keyboard handling suggestions - -Rahul Abrol - "hide others" patch -Adam Ratcliffe - preferences panel documentation -Peter Dyballa - assistance with non-ASCII rendering and keyboard handling -David M. Cooke - fix to XPM crash bug -Carsten Bormann - initial patch and assistance getting dired working for non-ASCII filenames -Andrew Moore - assistance on ns-mark-nav extension - -The GNUstep port was made possible through the assistance of Adam -Fedor, Fred Kiefer, M. Uli Klusterer, Alexander Malmberg, Jonas -Matton, and Riccardo Mottola. Leigh Smith maintained the SourceForge -project for a period. - -Suggestions from Darcy Brockbank, Timothy Bissell, Scott Byer, David -Griffiths, Scott Hess, Eberhard Mandler, John C. Randolph, and Bradley -Taylor all helped things along at one point or another. Axel Seibert -and Paul J. Sanchez offered their time and machines to make a -binary release possible. - -We would also like to thank a number of people who kept up the -constant supply of bug reports, suggested features and praise: Hardy -Mayer, Gisli Ottarsson, Anthony Heading, David Bau, Jamie Zawinski, -Martin Moncrieffe, Simson L. Garfinkel, Richard Stallman, Stephen -Anderson, Ivo Welch, Magnus Nordborg, Tom Epperly, Andreas Koenig, -Yves Arrouye, Anil Somayaji, Gregor Hoffleit; and the few hundred -other people on the mailing list from whom we didn't hear much, but -the presence of which assured us that maybe this project was actually -worth doing. === modified file 'nextstep/ChangeLog' --- nextstep/ChangeLog 2010-10-13 03:11:55 +0000 +++ nextstep/ChangeLog 2010-10-13 03:17:59 +0000 @@ -1,6 +1,8 @@ 2010-10-13 Glenn Morris * README: Remove information duplicated in AUTHORS. + Move historical information to new file ../etc/NEXTSTEP. + * AUTHORS: Merge into ./etc/NEXTSTEP and remove file. 2010-10-12 Glenn Morris === modified file 'nextstep/README' --- nextstep/README 2010-10-13 03:11:55 +0000 +++ nextstep/README 2010-10-13 03:17:59 +0000 @@ -20,233 +20,6 @@ Tested on GNU/Linux, should work on other systems, perhaps with minor build tweaking. - -Background ----------- -Within Emacs, the port and its code are referred to using the term -"Nextstep", despite the fact that no system or API has been released -under this name in more than 10 years. Here's some background on why: - -NeXT, Inc. introduced the NeXTstep API with its computer and operating -system in the late 1980's. Later on, in collaboration with Sun, this -API was published as a specification called OpenStep. The GNUstep -project started in the early 1990's to provide a free implementation -of this API. Later on, Apple bought NeXT (some would say "NeXT bought -Apple") and made OpenStep the basis of OS X, calling the API "Cocoa". -Since then, Cocoa has evolved beyond the OpenStep specification, and -GNUstep has followed it. - -Thus, calling this port "OpenStep" is not technically accurate, and in -the absence of any other determinant, we are using the term -"Nextstep", both because it signifies the original inspiration that -created these APIs, and because all of the classes and functions still -begin with the letters "NS". - -(See http://en.wikipedia.org/wiki/Nextstep) - -This Emacs port was first released in the early 1990's on the NeXT -computer, and was successively updated to OpenStep, Rhapsody, OS X, -and then finally GNUstep, tracking GNU emacs core releases in the -meantime. - - -Release History ---------------- - -1990-1992 1.0-3.0 (?) Michael Brouwer's socket/terminal communication - based version (GUI ran as a separate process.) - -1993/10/25 3.0.1 Last (?) release of Brouwer version. Supports - NeXTstep 3.x and below. - -1994/04/24 4.0 Carl Edman's version using direct API following - the X-Windows port. NeXTstep 3.x only. - -1995/06/15 4.1 Second (and last) Carl Edman release, based on - Emacs 19.28. - -1996/07/28 4.2 First Christian Limpach release, based on - Emacs 19.29. - -?? 5.0 ?? - -1997/12/?? 6.0b1 Ported to OpenStep by Scott Bender. Updated - to Emacs 20.2. - -?? 6.0b2 (?) Scott Bender: ported to Rhapsody. - -1999/05/?? 6.0b3 Scott Bender: "OS X Server", Emacs 20.3. - -2001/06/25 7.0 Ported to MacOS X (10.1) by Christophe de - Dinechin. Release based on Emacs 20.7. Hosting - moved to SourceForge. - -2002/01/03 7.0.1 Bug fixes. - -2002/08/27 7.0.2 Jaguar (OS X 10.2) support. Added an autoconf - option for sys_nerr being in stdio. Added - libncurses to the build libraries. Fixed a - problem with ns-alternate-is-meta. Changed the - icon color to blue, since Jaguar is yellow. - -2004/10/07 8.0-pre1 Ported to GNUstep by Adrian Robert. - -2004/11/04 8.0-pre2 Restored functionality on OS X (menu code - cleanup). Improved scrollbar handling and - paste from other applications. File icons - obtained properly from NSWorkspace. Dropped - Gorm and Nib files. Background refresh bug - fixed (in GNUstep). Various small fixes and - code cleanups. Now starts up under Art. - -2005/01/27 8.0-pre3 Bold and italic faces supported. Cursor and - mouse highlighting rendering bugs - fixed. Drag/drop and cut/paste interaction - w/external apps fixed. File load/save panels - available. Stability and rendering speed - improvements. Some ObjC and VC mode bugs fixed. - -2005/02/27 8.0-rc1 Dynamic path detection at startup so Emacs.app - can be moved anywhere. Added binary packages - and simplified source installation to running - two scripts. Thorough cleanup of menu code; - now fully functional. Fixed all detected - memory leaks. Minor frame focus and title - bugs fixed. - -2005/03/30 8.0-rc2 "Configure" info directory now uses dynamic - path setting, so info files can go under .app. - Improved select() handling and PTY fixes so - shell mode and tramp run smoothly. - Significant rendering optimizations under - GNUstep, and now works under Art backend. - Non-Latin text rendering works (but not - fontsets), and LEIM is bundled. UTF8 is used - for clipboard interaction. - Arrow cursor now used on scrollbar. - objc-mode and tramp now bundled in site-lisp. - -2005/05/30 8.0-rc3 Fixed bug with parsing of "easymenu" menus. - Many problems with modes such as SLIME, MatLab, - and Planner go away. Improved scrollbar - handling and rendering speed. Color panel - and other bug fixes. mac-fix-env utility. - Font handling improvements (OS X 10.3, 10.4): - - heed 'GSFontAntiAlias' default - - heed system antialiasing threshold - - added 'UseQuickdrawSmoothing' default to - invoke less heavy antialiasing - -2005/07/05 8.0-rc4 Added a Preferences panel. Cleaned up - rendering for synthetic italic fonts. Further - improved menu parsing. Use system highlight - color. Added previous- and next-mark history - navigation commmands bound to M-p,M-n. - Miscellaneous bug fixes. - -2005/08/04 8.0-rc5 All internal string handling changed to UTF-8. - This means menu items, color and color list - names, and a few other things will now display - properly. It does NOT mean UTF-8 filenames - are displayed correctly in the minibuffer. - Also relating to UTF-8, contents of files - using this coding can now be displayed (though - not auto-recognized; add extensions to your - default coding alist). Limited mac-roman - support was also added (also sans recognition). - Certain characters are not displayed properly - due to a translation problem. (UTF-8 based on - work by Otfried Cheong; mac-roman from - emacs-21.) Partial support for "dead-key" - handling now added. Transparency (e.g., M-x - set-background-color ARGB88FFFFFF) improved: - only the background is made transparent. - Cursor drawing glitches fixed. Preferences - handling improved. Fixed some portability - problems on Tiger and Puma. - -2005/09/12 8.0 Bundled ispell on OS X. Minor bug fixes and - stability improvements. Compiles under gcc-4. - -2005/09/26 8.0.1 Correct clipped rendering for synthetic - italics. Include the info directory. - Fix grabenv. Bundle whitespace package. - -2005/10/27 8.0.2 Correct rendering for wide characters during - cursor movement. Fix bungled hack in ispell - bundling. - -2005/11/05 9.0-pre1 Updated to latest Emacs CVS code on unicode-2 - branch (proposed to be released 2006/2007 as - Emacs 23). - -2005/11/11 9.0-pre2 Fix crashes for deiconifying and loading - certain images. Improve vertical font metrics - (fixes inaccurate page up/down, window size, - and partial lines). Support better remapping - of Alt/Opt and remapping of Command. More - insistent defaulting of scrollbar to right. - Modest improvements to build process. - -2006/04/22 9.0-pre2a Stopgap interim release to sync w/latest - unicode-2 CVS. Includes XPM and partial - toolbar support. - -2006/06/08 9.0-pre3 Major upgrade to keyboard handling: - system-selected compositional input methods - should now work, as well as more keys / - keyboards. XPM, toolbar, and tooltip support. - Some improvements to scrollbars, zoom, italic - rendering, pasting, Color panel. Added function - ns-set-background-alpha to work around - inability to customize with numeric colors. - -2006/12/24 9.0-rc1 Reworked font handling and text rendering to - use Kenichi Handa's new font back-end system. - Font sets are now supported and automatically - created when a font is selected. Added recent - X11 colors to Emacs.clr (remove - ~/Library/Colors/Emacs.clr to pick up). Added - ns-option-modifier, ns-control-modifier, - ns-function-modifier customization variables. - Update menus to Emacs 21+ conventions. Right - mouse button now generates mouse-3 events. - Various bug fixes and rendering improvements. - -2007/09/10 9.0-rc2 Improve menubar, popup menu, and scrollbar - behavior, let accented char entry work in - isearch, follow system keymap for shortcut - keys, fix border and box drawing, remove - glitches in modeline drawing, support - overstrike for unavailable bold fonts, fix XPM - related crasher bugs. Incremental font - metrics caching and other performance - improvements. Shared-lisp builds now possible. - -2007/09/20 9.0-rc2a Interim release. New features: composed - character display, colored fringe bitmaps, - colored relief drawing, dynamic resizing, - Bug fixes: popup menu position and selection, - font width calculation, face color adaptation - to background, submenu keyboard navigation. - NOT TESTED ON GNUSTEP. - -2007/11/19 9.0-rc3 Integrated the multi-TTY functionality from - emacs core (however, mixed TTY and GUI - sessions are not working yet). Support 10.5. - Give site-lisp load precedence over lisp and - add a compile option to prefer an additional - directory, use miniaturized miniwindow images - in some cases, rename cursor types for - consistency w/other emacs terms, improved font - selection for symbol scripts. - Bug fixes: fringe and bitmap, frame deletion, - resizing, cursor blink, workspace open-file, - image backgrounds, toolbar item enablement, - context menu positioning. - -2008/07/15 (none) Merge to GNU Emacs CVS trunk. - This file is part of GNU Emacs. ------------------------------------------------------------ revno: 101943 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-12 20:11:55 -0700 message: * nextstep/README: Remove information duplicated in AUTHORS. diff: === modified file 'nextstep/ChangeLog' --- nextstep/ChangeLog 2010-10-12 04:01:55 +0000 +++ nextstep/ChangeLog 2010-10-13 03:11:55 +0000 @@ -1,3 +1,7 @@ +2010-10-13 Glenn Morris + + * README: Remove information duplicated in AUTHORS. + 2010-10-12 Glenn Morris * FOR-RELEASE: Merge into ../etc/TODO. @@ -182,10 +186,9 @@ ;; Local Variables: ;; coding: utf-8 -;; add-log-time-zone-rule: t ;; End: - Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. + Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc. This file is part of GNU Emacs. @@ -201,5 +204,3 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . - -;; arch-tag: 963ee08e-8e76-485f-9cfb-65a4333a073c === modified file 'nextstep/README' --- nextstep/README 2010-01-13 08:35:10 +0000 +++ nextstep/README 2010-10-13 03:11:55 +0000 @@ -10,19 +10,6 @@ See the INSTALL file in this directory for compilation instructions. -Those primarily responsible for the port were, in chronological order: -Michael Brouwer, Carl Edman, Christian Limpach, Scott Bender, -Christophe de Dinechin, and Adrian Robert. - -Peter Dyballa assisted in a variety of ways to improve text rendering -and keyboard handling, Adam Ratcliffe documented the Preferences -panel, David M. Cooke contributed fixes to XPM handling, and Carsten -Bormann helped get dired working for non-ASCII filenames. People who -provided additional assistance include Adam Fedor, Fred Kiefer, M. Uli -Klusterer, Alexander Malmberg, Jonas Matton, and Riccardo Mottola. -See AUTHORS file and "Release History" below for more information. - - Requirements ------------ MacOS X 10.4 or later ------------------------------------------------------------ revno: 101942 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-12 20:11:08 -0700 message: * nextstep/AUTHORS: Remove email addresses. diff: === modified file 'nextstep/AUTHORS' --- nextstep/AUTHORS 2008-11-14 20:45:28 +0000 +++ nextstep/AUTHORS 2010-10-13 03:11:08 +0000 @@ -1,5 +1,5 @@ -In addition to the folks listed in ../AUTHORS responsible for GNU Emacs itself, -the NeXTstep port owes to the following people: +In addition to the folks listed in etc/AUTHORS responsible for GNU Emacs +itself, the NeXTstep port owes to the following people: Carl Edman original author and maintainer, mainly UI @@ -44,8 +44,7 @@ Suggestions from Darcy Brockbank, Timothy Bissell, Scott Byer, David Griffiths, Scott Hess, Eberhard Mandler, John C. Randolph, and Bradley Taylor all helped things along at one point or another. Axel Seibert - and Paul J. Sanchez - offered their time and machines to make a +and Paul J. Sanchez offered their time and machines to make a binary release possible. We would also like to thank a number of people who kept up the ------------------------------------------------------------ revno: 101941 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-12 20:08:45 -0700 message: More make-dist simplification. * make-dist: Remove --compress. Check for the appropriate gzip-like executable, and if not found, don't compress. Check version number in README, don't change it. Use find for nt/inc/*.h. diff: === modified file 'ChangeLog' --- ChangeLog 2010-10-12 21:03:09 +0000 +++ ChangeLog 2010-10-13 03:08:45 +0000 @@ -1,3 +1,10 @@ +2010-10-13 Glenn Morris + + * make-dist: Remove --compress. Check for the appropriate + gzip-like executable, and if not found, don't compress. + Check version number in README, don't change it. + Use find for nt/inc/*.h. + 2010-10-12 Dan Nicolaescu * configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): Remove === modified file 'make-dist' --- make-dist 2010-10-12 08:05:28 +0000 +++ make-dist 2010-10-13 03:08:45 +0000 @@ -49,6 +49,7 @@ check=yes clean_up=no make_tar=no +default_gzip=gzip newer="" while [ $# -gt 0 ]; do @@ -78,12 +79,7 @@ new_extension=".new" shift ;; - ## This option tells make-dist to use `compress' instead of gzip. - ## Normally, make-dist uses gzip whenever it is present. - "--compress") - default_gzip="compress" - ;; - ## Same with bzip2. + ## This option tells make-dist to use `bzip2' instead of gzip. "--bzip2") default_gzip="bzip2" ;; @@ -104,7 +100,6 @@ echo "" echo " --bzip2 use bzip2 instead of gzip" echo " --clean-up delete staging directories when done" - echo " --compress use compress instead of gzip" echo " --lzma use lzma instead of gzip" echo " --newer=TIME don't include files older than TIME" echo " --no-check don't check for bad file names etc." @@ -161,12 +156,11 @@ echo Version number is $version -if [ $update = yes ]; -then - if grep -s "@set EMACSVER *${version}" ./doc/emacs/emacsver.texi > /dev/null; then - true - else - echo "You must update the version number in \`./doc/emacs/emacsver.texi'" +if [ $update = yes ]; then + if ! grep -q "@set EMACSVER *${version}" doc/emacs/emacsver.texi || \ + ! grep -q "tree holds version *${version}" README; then + echo "WARNING: README and/or emacsver.texi have the wrong version number" + echo "Consider running M-x set-version from admin/admin.el" sleep 5 fi fi @@ -312,17 +306,6 @@ ln config.bat make-dist update-subdirs vpath.sed .dir-locals.el ${tempdir} ln mkinstalldirs config.sub config.guess install-sh ${tempdir} -## FIXME why do we bother doing this? set-version in admin/admin.el -## does this, and more besides. -echo "Updating version number in README" -(cd ${tempdir} - awk \ - '$1 " " $2 " " $3 " " $4 " " $5 == "This directory tree holds version" { $6 = version; print $0 } - $1 " " $2 " " $3 " " $4 " " $5 != "This directory tree holds version"' \ - version=${version} README > tmp.README - mv -f tmp.README README) - - echo "Creating subdirectories" for subdir in site-lisp \ leim leim/CXTERM-DIC leim/MISC-DIC \ @@ -417,28 +400,18 @@ (cd m4 ln *.m4 ../${tempdir}/m4) +## Exclude README.W32 because it is specific to pre-built binaries(?). echo "Making links to \`nt'" (cd nt ln emacs.manifest emacs.rc emacsclient.rc config.nt ../${tempdir}/nt ln emacs-src.tags nmake.defs gmake.defs subdirs.el ../${tempdir}/nt ln [a-z]*.bat [a-z]*.[ch] ../${tempdir}/nt - ln ChangeLog INSTALL README README.W32 makefile.w32-in ../${tempdir}/nt) - -echo "Making links to \`nt/inc'" -(cd nt/inc - ln [a-z]*.h ../../${tempdir}/nt/inc) - -echo "Making links to \`nt/inc/sys'" -(cd nt/inc/sys - ln [a-z]*.h ../../../${tempdir}/nt/inc/sys) - -echo "Making links to \`nt/inc/arpa'" -(cd nt/inc/arpa - ln [a-z]*.h ../../../${tempdir}/nt/inc/arpa) - -echo "Making links to \`nt/inc/netinet'" -(cd nt/inc/netinet - ln [a-z]*.h ../../../${tempdir}/nt/inc/netinet) + ln ChangeLog INSTALL README makefile.w32-in ../${tempdir}/nt) + +echo "Making links to \`nt/inc' and its subdirectories" +for f in `find nt/inc -type f -name '[a-z]*.h'`; do + ln $f $tempdir/$f +done echo "Making links to \`nt/icons'" (cd nt/icons @@ -493,8 +466,7 @@ done echo "Making links to \`info'" -(cd info - ln `find . -type f -print` ../${tempdir}/info) +ln `find info -type f -print` ${tempdir}/info echo "Making links to \`doc/emacs'" (cd doc/emacs @@ -542,24 +514,23 @@ find ${tempparent} \( -name '*~' -o -name '#*#' -o -name '.*ignore' -o -name '=*' -o -name 'TAGS' \) -exec rm -f {} \; if [ "${make_tar}" = yes ]; then - if [ "${default_gzip}" = "" ]; then - echo "Looking for gzip" - temppath=`echo $PATH | sed 's/^:/.:/ - s/::/:.:/g - s/:$/:./ - s/:/ /g'` - default_gzip=`( - for dir in ${temppath}; do - if [ -f ${dir}/gzip ]; then echo 'gzip --best'; exit 0; fi - done - echo compress - )` + echo "Looking for $default_gzip" + found=0 + temppath=`echo $PATH | sed -e 's/^:/.:/' -e 's/::/:.:/g' -e 's/:$/:./' \ + -e 's/:/ /g'` + for dir in ${temppath}; do + [ -x ${dir}/$default_gzip ] || continue + found=1; break + done + if [ "$found" = "0" ]; then + echo "WARNING: \`$default_gzip' not found, will not compress" >&2 + default_gzip=cat fi case "${default_gzip}" in - bzip2) gzip_extension=.bz2 ;; - compress* ) gzip_extension=.Z ;; - lzma) gzip_extension=.lzma ;; - * ) gzip_extension=.gz ;; + bzip2) gzip_extension=.bz2 ;; + lzma) gzip_extension=.lzma ;; + gzip) gzip_extension=.gz ; default_gzip="gzip --best";; + *) gzip_extension= ;; esac echo "Creating tar file" (cd ${tempparent} ; tar cvf - ${emacsname} ) \ ------------------------------------------------------------ revno: 101940 committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2010-10-13 02:19:11 +0000 message: gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' position when (X-)Faces exist. gnus-gravatar.el (gnus-treat-from-gravatar, gnus-treat-mail-gravatar): Force displaying avatars when called interactively. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-12 22:18:24 +0000 +++ lisp/gnus/ChangeLog 2010-10-13 02:19:11 +0000 @@ -1,3 +1,10 @@ +2010-10-13 Katsumi Yamaoka + + * gnus-gravatar.el (gnus-gravatar-transform-address): Adjust avatars' + position when (X-)Faces exist. + (gnus-treat-from-gravatar, gnus-treat-mail-gravatar): Force displaying + avatars when called interactively. + 2010-10-12 Katsumi Yamaoka * gnus-gravatar.el (gnus-gravatar-too-ugly): Don't test if === modified file 'lisp/gnus/gnus-gravatar.el' --- lisp/gnus/gnus-gravatar.el 2010-10-12 22:18:24 +0000 +++ lisp/gnus/gnus-gravatar.el 2010-10-13 02:19:11 +0000 @@ -49,7 +49,7 @@ :version "24.1" :group 'gnus-gravatar) -(defun gnus-gravatar-transform-address (header category) +(defun gnus-gravatar-transform-address (header category &optional force) (gnus-with-article-headers (let ((addresses (mail-header-parse-addresses @@ -59,20 +59,25 @@ (ignore-errors (mail-encode-encoded-word-string (or (mail-fetch-field header) ""))) - (mail-fetch-field header))))) - (let ((gravatar-size gnus-gravatar-size)) - (dolist (address addresses) - (unless (and gnus-gravatar-too-ugly - (or (string-match gnus-gravatar-too-ugly - (car address)) - (and (cdr address) - (string-match gnus-gravatar-too-ugly - (cdr address))))) - (ignore-errors - (gravatar-retrieve - (car address) - 'gnus-gravatar-insert - (list header address category))))))))) + (mail-fetch-field header)))) + (gravatar-size gnus-gravatar-size) + name) + (dolist (address addresses) + (when (and (setq name (cdr address)) + (string-match "\\`\\*+ " name)) ;; (X-)Faces exist. + (setcdr address (setq name (substring name (match-end 0))))) + (when (or force + (not (and gnus-gravatar-too-ugly + (or (string-match gnus-gravatar-too-ugly + (car address)) + (and name + (string-match gnus-gravatar-too-ugly + name)))))) + (ignore-errors + (gravatar-retrieve + (car address) + 'gnus-gravatar-insert + (list header address category)))))))) (defun gnus-gravatar-insert (gravatar header address category) "Insert GRAVATAR for ADDRESS in HEADER in current article buffer. @@ -109,31 +114,25 @@ (gnus-add-image category gravatar))))))))) ;;;###autoload -(defun gnus-treat-from-gravatar () +(defun gnus-treat-from-gravatar (&optional force) "Display gravatar in the From header. If gravatar is already displayed, remove it." - (interactive) + (interactive (list t)) ;; When type `W D g' (gnus-with-article-buffer (if (memq 'from-gravatar gnus-article-wash-types) - (gnus-delete-images 'from-gravatar) - (let ((gnus-gravatar-too-ugly - (unless buffer-read-only ;; When type `W D g' - gnus-gravatar-too-ugly))) - (gnus-gravatar-transform-address "from" 'from-gravatar))))) + (gnus-delete-images 'from-gravatar) + (gnus-gravatar-transform-address "from" 'from-gravatar force)))) ;;;###autoload -(defun gnus-treat-mail-gravatar () +(defun gnus-treat-mail-gravatar (&optional force) "Display gravatars in the Cc and To headers. If gravatars are already displayed, remove them." - (interactive) + (interactive (list t)) ;; When type `W D h' (gnus-with-article-buffer (if (memq 'mail-gravatar gnus-article-wash-types) (gnus-delete-images 'mail-gravatar) - (let ((gnus-gravatar-too-ugly - (unless buffer-read-only ;; When type `W D h' - gnus-gravatar-too-ugly))) - (gnus-gravatar-transform-address "cc" 'mail-gravatar) - (gnus-gravatar-transform-address "to" 'mail-gravatar))))) + (gnus-gravatar-transform-address "cc" 'mail-gravatar force) + (gnus-gravatar-transform-address "to" 'mail-gravatar force)))) (provide 'gnus-gravatar) ------------------------------------------------------------ revno: 101939 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2010-10-12 22:18:24 +0000 message: Merge changes made in Gnus trunk. gnus-gravatar.el (gnus-art): Required. shr.el (shr-tag-img): Add align attribute support for . gnus-gravatar.el (gnus-gravatar-insert): Check if buffer is alive. shr.el (shr-tag-img): Encode URL properly when retrieving. shr.el (shr-get-image-data): Encode URL properly when fetching from cache. shr.el (shr-tag-img): Use aligned-to spaces to align correctly images. nnimap.el (nnimap-request-rename-group): Unselect by selecting a mailbox that doesn't exist. rfc2231.el (rfc2231-parse-string): Ignore repeated parts. gnus-gravatar.el (gnus-gravatar-too-ugly): Don't test if gnus-article-x-face-too-ugly is bound. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-12 14:17:15 +0000 +++ lisp/gnus/ChangeLog 2010-10-12 22:18:24 +0000 @@ -1,4 +1,29 @@ -2010-10-12 Lars Magne Ingebrigtsen +2010-10-12 Katsumi Yamaoka + + * gnus-gravatar.el (gnus-gravatar-too-ugly): Don't test if + gnus-article-x-face-too-ugly is bound. + +2010-10-12 Lars Magne Ingebrigtsen + + * rfc2231.el (rfc2231-parse-string): Ignore repeated parts. + + * nnimap.el (nnimap-request-rename-group): Unselect by selecting a + mailbox that doesn't exist. + +2010-10-12 Julien Danjou + + * shr.el (shr-tag-img): Encode URL properly when retrieving. + (shr-get-image-data): Encode URL properly when fetching from cache. + (shr-tag-img): Use aligned-to spaces to align correctly images. + + * gnus-gravatar.el (gnus-gravatar-insert): Check if buffer is alive + before inserting the Gravatar. + + * shr.el (shr-tag-img): Add align attribute support for . + +2010-10-12 Lars Magne Ingebrigtsen + + * gnus-gravatar.el (gnus-art): Required. * gnus-sum.el (gnus-summary-mark-as-unread-forward) (gnus-summary-mark-as-unread-backward, gnus-summary-mark-as-unread): === modified file 'lisp/gnus/ecomplete.el' --- lisp/gnus/ecomplete.el 2010-09-02 01:42:32 +0000 +++ lisp/gnus/ecomplete.el 2010-10-12 22:18:24 +0000 @@ -147,7 +147,7 @@ (save-restriction (narrow-to-region (point) (point-at-eol)) (while (not (eobp)) - ;; Put the 'region face on any charactes on this line that + ;; Put the 'region face on any characters on this line that ;; aren't already highlighted. (unless (get-text-property (point) 'face) (put-text-property (point) (1+ (point)) 'face 'highlight)) === modified file 'lisp/gnus/gnus-gravatar.el' --- lisp/gnus/gnus-gravatar.el 2010-10-09 08:44:12 +0000 +++ lisp/gnus/gnus-gravatar.el 2010-10-12 22:18:24 +0000 @@ -25,6 +25,7 @@ ;;; Code: (require 'gravatar) +(require 'gnus-art) (defgroup gnus-gravatar nil "Gnus Gravatar." @@ -42,8 +43,7 @@ :version "24.1" :group 'gnus-gravatar) -(defcustom gnus-gravatar-too-ugly (if (boundp 'gnus-article-x-face-too-ugly) - gnus-article-x-face-too-ugly) +(defcustom gnus-gravatar-too-ugly gnus-article-x-face-too-ugly "Regexp matching posters whose avatar shouldn't be shown automatically." :type '(choice regexp (const nil)) :version "24.1" @@ -79,32 +79,34 @@ Set image category to CATEGORY." (unless (eq gravatar 'error) (gnus-with-article-headers - (gnus-article-goto-header header) - (mail-header-narrow-to-field) - (let ((real-name (cdr address)) - (mail-address (car address))) - (when (if real-name ; have a realname, go for it! - (and (search-forward real-name nil t) - (search-backward real-name nil t)) - (and (search-forward mail-address nil t) - (search-backward mail-address nil t))) - (goto-char (1- (point))) - ;; If we're on the " quoting the name, go backward - (when (looking-at "[\"<]") - (goto-char (1- (point)))) - ;; Do not do anything if there's already a gravatar. This can - ;; happens if the buffer has been regenerated in the mean time, for - ;; example we were fetching someaddress, and then we change to - ;; another mail with the same someaddress. - (unless (memq 'gnus-gravatar (text-properties-at (point))) - (let ((inhibit-read-only t) - (point (point))) - (unless (featurep 'xemacs) - (setq gravatar (append gravatar gnus-gravatar-properties))) - (gnus-put-image gravatar nil category) - (put-text-property point (point) 'gnus-gravatar address) - (gnus-add-wash-type category) - (gnus-add-image category gravatar)))))))) + ;; The buffer can be gone at this time + (when (buffer-live-p (current-buffer)) + (gnus-article-goto-header header) + (mail-header-narrow-to-field) + (let ((real-name (cdr address)) + (mail-address (car address))) + (when (if real-name ; have a realname, go for it! + (and (search-forward real-name nil t) + (search-backward real-name nil t)) + (and (search-forward mail-address nil t) + (search-backward mail-address nil t))) + (goto-char (1- (point))) + ;; If we're on the " quoting the name, go backward + (when (looking-at "[\"<]") + (goto-char (1- (point)))) + ;; Do not do anything if there's already a gravatar. This can + ;; happens if the buffer has been regenerated in the mean time, for + ;; example we were fetching someaddress, and then we change to + ;; another mail with the same someaddress. + (unless (memq 'gnus-gravatar (text-properties-at (point))) + (let ((inhibit-read-only t) + (point (point))) + (unless (featurep 'xemacs) + (setq gravatar (append gravatar gnus-gravatar-properties))) + (gnus-put-image gravatar nil category) + (put-text-property point (point) 'gnus-gravatar address) + (gnus-add-wash-type category) + (gnus-add-image category gravatar))))))))) ;;;###autoload (defun gnus-treat-from-gravatar () === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2010-10-11 23:29:33 +0000 +++ lisp/gnus/nnimap.el 2010-10-12 22:18:24 +0000 @@ -673,8 +673,11 @@ (deffoo nnimap-request-rename-group (group new-name &optional server) (when (nnimap-possibly-change-group nil server) (with-current-buffer (nnimap-buffer) - ;; Make sure we don't have this group open read/write. - (nnimap-command "EXAMINE %S" (utf7-encode group 7)) + ;; Make sure we don't have this group open read/write by asking + ;; to examine a mailbox that doesn't exist. This seems to be + ;; the only way that allows us to reliably go back to unselected + ;; state on Courier. + (nnimap-command "EXAMINE DOES.NOT.EXIST") (setf (nnimap-group nnimap-object) nil) (car (nnimap-command "RENAME %S %S" (utf7-encode group t) (utf7-encode new-name t)))))) === modified file 'lisp/gnus/rfc2231.el' --- lisp/gnus/rfc2231.el 2010-09-02 00:55:51 +0000 +++ lisp/gnus/rfc2231.el 2010-10-12 22:18:24 +0000 @@ -185,11 +185,19 @@ in (sort parameters (lambda (e1 e2) (< (or (caddr e1) 0) (or (caddr e2) 0)))) - do (if (or (not (setq elem (assq attribute cparams))) - (and (numberp part) - (zerop part))) - (push (list attribute value encoded) cparams) - (setcar (cdr elem) (concat (cadr elem) value)))) + do (cond + ;; First part. + ((or (not (setq elem (assq attribute cparams))) + (and (numberp part) + (zerop part))) + (push (list attribute value encoded) cparams)) + ;; Repetition of a part; do nothing. + ((and elem + (null number)) + ) + ;; Concatenate continuation parts. + (t + (setcar (cdr elem) (concat (cadr elem) value))))) ;; Finally decode encoded values. (cons type (mapcar (lambda (elem) === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2010-10-11 22:27:28 +0000 +++ lisp/gnus/shr.el 2010-10-12 22:18:24 +0000 @@ -344,7 +344,7 @@ (with-temp-buffer (mm-disable-multibyte) (when (ignore-errors - (url-cache-extract (url-cache-create-filename url)) + (url-cache-extract (url-cache-create-filename (shr-encode-url url))) t) (when (or (search-forward "\n\n" nil t) (search-forward "\r\n\r\n" nil t)) @@ -389,19 +389,40 @@ (put-text-property (or shr-start start) (point) 'keymap shr-map) (put-text-property (or shr-start start) (point) 'shr-url url))) +(defun shr-encode-url (url) + "Encode URL." + (browse-url-url-encode-chars url "[)$ ]")) + (defun shr-tag-img (cont) (when (and (> (current-column) 0) (not (eq shr-state 'image))) (insert "\n")) - (let ((start (point-marker))) - (let ((alt (cdr (assq :alt cont))) - (url (cdr (assq :src cont)))) + (let ((alt (cdr (assq :alt cont))) + (url (cdr (assq :src cont))) + (width (cdr (assq :width cont)))) + ;; Only respect align if width specified. + (when width + ;; Check that width is not larger than max width, otherwise ignore + ;; align + (let ((max-width (* fill-column (frame-char-width))) + (width (string-to-number width))) + (when (< width max-width) + (let ((align (cdr (assq :align cont)))) + (cond ((string= align "right") + (insert (propertize + " " 'display + `(space . (:align-to ,(list (- max-width width))))))) + ((string= align "center") + (insert (propertize + " " 'display + `(space . (:balign-to ,(list (- (/ max-width 2) width)))))))))))) + (let ((start (point-marker))) (when (zerop (length alt)) - (setq alt "[img]")) + (setq alt "[img]")) (cond ((and (not shr-inhibit-images) - (string-match "\\`cid:" url)) - (let ((url (substring url (match-end 0))) + (string-match "\\`cid:" url)) + (let ((url (substring url (match-end 0))) image) (if (or (not shr-content-function) (not (setq image (funcall shr-content-function url)))) @@ -415,12 +436,12 @@ (if (> (length alt) 8) (shr-insert (substring alt 0 8)) (shr-insert alt)))) - ((url-is-cached (browse-url-url-encode-chars url "[&)$ ]")) + ((url-is-cached (shr-encode-url url)) (shr-put-image (shr-get-image-data url) (point) alt)) (t (insert alt) (ignore-errors - (url-retrieve url 'shr-image-fetched + (url-retrieve (shr-encode-url url) 'shr-image-fetched (list (current-buffer) start (point-marker)) t)))) (insert " ") ------------------------------------------------------------ revno: 101938 committer: Dan Nicolaescu branch nick: trunk timestamp: Tue 2010-10-12 14:03:09 -0700 message: Remove trailing / from directory names. * configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): Remove trailing / from directory names. diff: === modified file 'ChangeLog' --- ChangeLog 2010-10-12 04:32:20 +0000 +++ ChangeLog 2010-10-12 21:03:09 +0000 @@ -1,3 +1,8 @@ +2010-10-12 Dan Nicolaescu + + * configure (ns_appdir, OLDXMENU, TOOLTIP_SUPPORT): Remove + trailing / from directory names. + 2010-10-12 Glenn Morris * make-dist: Update and simplify. === modified file 'configure' --- configure 2010-10-10 15:35:04 +0000 +++ configure 2010-10-12 21:03:09 +0000 @@ -7679,15 +7679,15 @@ if test "${with_ns}" != no; then if test "${opsys}" = darwin; then NS_IMPL_COCOA=yes - ns_appdir=`pwd`/nextstep/Emacs.app/ - ns_appbindir=${ns_appdir}Contents/MacOS/ - ns_appresdir=${ns_appdir}Contents/Resources + ns_appdir=`pwd`/nextstep/Emacs.app + ns_appbindir=${ns_appdir}/Contents/MacOS/ + ns_appresdir=${ns_appdir}/Contents/Resources ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base elif test -f $GNUSTEP_CONFIG_FILE; then NS_IMPL_GNUSTEP=yes - ns_appdir=`pwd`/nextstep/Emacs.app/ + ns_appdir=`pwd`/nextstep/Emacs.app ns_appbindir=${ns_appdir} - ns_appresdir=${ns_appdir}Resources + ns_appresdir=${ns_appdir}/Resources ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" GNUSTEP_SYSTEM_LIBRARIES="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_LIBRARIES)" @@ -7751,7 +7751,7 @@ fi ns_frag=$srcdir/src/ns.mk NS_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o fontset.o fringe.o image.o" - NS_SUPPORT="\${lispsource}emacs-lisp/easymenu.elc \${lispsource}term/ns-win.elc" + NS_SUPPORT="\${lispsource}/emacs-lisp/easymenu.elc \${lispsource}/term/ns-win.elc" fi CFLAGS="$tmp_CFLAGS" CPPFLAGS="$tmp_CPPFLAGS" @@ -14696,9 +14696,9 @@ if test "$USE_X_TOOLKIT" = "none"; then - OLDXMENU="\${oldXMenudir}libXMenu11.a" + OLDXMENU="\${oldXMenudir}/libXMenu11.a" else - OLDXMENU="\${lwlibdir}liblw.a" + OLDXMENU="\${lwlibdir}/liblw.a" fi LIBXMENU="\$(OLDXMENU)" LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)" @@ -14909,7 +14909,7 @@ $as_echo "#define HAVE_MOUSE 1" >>confdefs.h MOUSE_SUPPORT="\$(REAL_MOUSE_SUPPORT)" - TOOLTIP_SUPPORT="\${lispsource}mouse.elc" + TOOLTIP_SUPPORT="\${lispsource}/mouse.elc" WINDOW_SUPPORT="\$(BASE_WINDOW_SUPPORT)" test "$HAVE_X_WINDOWS" = "yes" && \ === modified file 'configure.in' --- configure.in 2010-10-10 15:35:04 +0000 +++ configure.in 2010-10-12 21:03:09 +0000 @@ -1491,15 +1491,15 @@ if test "${with_ns}" != no; then if test "${opsys}" = darwin; then NS_IMPL_COCOA=yes - ns_appdir=`pwd`/nextstep/Emacs.app/ - ns_appbindir=${ns_appdir}Contents/MacOS/ - ns_appresdir=${ns_appdir}Contents/Resources + ns_appdir=`pwd`/nextstep/Emacs.app + ns_appbindir=${ns_appdir}/Contents/MacOS/ + ns_appresdir=${ns_appdir}/Contents/Resources ns_appsrc=${srcdir}/nextstep/Cocoa/Emacs.base elif test -f $GNUSTEP_CONFIG_FILE; then NS_IMPL_GNUSTEP=yes - ns_appdir=`pwd`/nextstep/Emacs.app/ + ns_appdir=`pwd`/nextstep/Emacs.app ns_appbindir=${ns_appdir} - ns_appresdir=${ns_appdir}Resources + ns_appresdir=${ns_appdir}/Resources ns_appsrc=${srcdir}/nextstep/GNUstep/Emacs.base dnl FIXME sourcing this several times in subshells seems inefficient. GNUSTEP_SYSTEM_HEADERS="$(. $GNUSTEP_CONFIG_FILE; echo $GNUSTEP_SYSTEM_HEADERS)" @@ -1546,7 +1546,7 @@ fi ns_frag=$srcdir/src/ns.mk NS_OBJ="nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o nsfont.o fontset.o fringe.o image.o" - NS_SUPPORT="\${lispsource}emacs-lisp/easymenu.elc \${lispsource}term/ns-win.elc" + NS_SUPPORT="\${lispsource}/emacs-lisp/easymenu.elc \${lispsource}/term/ns-win.elc" fi CFLAGS="$tmp_CFLAGS" CPPFLAGS="$tmp_CPPFLAGS" @@ -3260,9 +3260,9 @@ Otherwise, Emacs expects to use version 10.]) if test "$USE_X_TOOLKIT" = "none"; then - OLDXMENU="\${oldXMenudir}libXMenu11.a" + OLDXMENU="\${oldXMenudir}/libXMenu11.a" else - OLDXMENU="\${lwlibdir}liblw.a" + OLDXMENU="\${lwlibdir}/liblw.a" fi LIBXMENU="\$(OLDXMENU)" LIBX_OTHER="\$(LIBXT) \$(LIBX_EXTRA)" @@ -3468,7 +3468,7 @@ AC_DEFINE(HAVE_WINDOW_SYSTEM, 1, [Define if you have a window system.]) AC_DEFINE(HAVE_MOUSE, 1, [Define if you have mouse support.]) MOUSE_SUPPORT="\$(REAL_MOUSE_SUPPORT)" - TOOLTIP_SUPPORT="\${lispsource}mouse.elc" + TOOLTIP_SUPPORT="\${lispsource}/mouse.elc" WINDOW_SUPPORT="\$(BASE_WINDOW_SUPPORT)" test "$HAVE_X_WINDOWS" = "yes" && \ ------------------------------------------------------------ revno: 101937 committer: Chong Yidong branch nick: trunk timestamp: Tue 2010-10-12 16:06:20 -0400 message: Add some default custom themes. * cus-theme.el (custom-theme--listed-faces): Add cursor face. (describe-theme-1): Extract doc from unloaded themes. * custom.el (custom-theme-name-valid-p): Don't list color-themes. * themes/tango-theme.el: * themes/tango-dark-theme.el: * themes/wheatgrass-theme.el: New files. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-12 03:10:21 +0000 +++ lisp/ChangeLog 2010-10-12 20:06:20 +0000 @@ -1,5 +1,16 @@ 2010-10-12 Chong Yidong + * cus-theme.el (custom-theme--listed-faces): Add cursor face. + (describe-theme-1): Extract doc from unloaded themes. + + * custom.el (custom-theme-name-valid-p): Don't list color-themes. + + * themes/tango-theme.el: + * themes/tango-dark-theme.el: + * themes/wheatgrass-theme.el: New files. + +2010-10-12 Chong Yidong + * cus-theme.el (describe-theme, customize-themes) (custom-theme-save): New commands. (custom-new-theme-mode-map): Bind C-x C-s. === modified file 'lisp/cus-theme.el' --- lisp/cus-theme.el 2010-10-12 03:10:21 +0000 +++ lisp/cus-theme.el 2010-10-12 20:06:20 +0000 @@ -56,7 +56,7 @@ (defvar custom-theme-insert-variable-marker nil) (defvar custom-theme-insert-face-marker nil) -(defvar custom-theme--listed-faces '(default fixed-pitch +(defvar custom-theme--listed-faces '(default cursor fixed-pitch variable-pitch escape-glyph minibuffer-prompt highlight region shadow secondary-selection trailing-whitespace font-lock-builtin-face font-lock-comment-delimiter-face @@ -478,21 +478,37 @@ (princ " is a custom theme") (let ((fn (locate-file (concat (symbol-name theme) "-theme.el") (cons custom-theme-directory load-path) - '("" "c")))) + '("" "c"))) + doc) (when fn (princ " in `") (help-insert-xref-button (file-name-nondirectory fn) 'help-theme-def fn) (princ "'")) - (princ ".\n")) - (if (not (memq theme custom-known-themes)) - (princ "It is not loaded.") - (if (custom-theme-enabled-p theme) - (princ "It is loaded and enabled.\n") - (princ "It is loaded but disabled.\n")) - (princ "\nDocumentation:\n") - (princ (or (get theme 'theme-documentation) - "No documentation available."))) + (princ ".\n") + (if (not (memq theme custom-known-themes)) + (progn + (princ "It is not loaded.") + ;; Attempt to grab the theme documentation + (when fn + (with-temp-buffer + (insert-file-contents fn) + (let ((sexp (let ((read-circle nil)) + (condition-case nil + (read (current-buffer)) + (end-of-file nil))))) + (and sexp (listp sexp) + (eq (car sexp) 'deftheme) + (setq doc (nth 2 sexp))))))) + (if (custom-theme-enabled-p theme) + (princ "It is loaded and enabled.") + (princ "It is loaded but disabled.")) + (setq doc (get theme 'theme-documentation))) + + (princ "\n\nDocumentation:\n") + (princ (if (stringp doc) + doc + "No documentation available."))) (princ "\n\nYou can ") (help-insert-xref-button "customize" 'help-theme-edit theme) (princ " this theme.")) === modified file 'lisp/custom.el' --- lisp/custom.el 2010-10-12 03:10:21 +0000 +++ lisp/custom.el 2010-10-12 20:06:20 +0000 @@ -1149,6 +1149,9 @@ (and (symbolp name) name (not (or (zerop (length (symbol-name name))) + ;; There's a third-party package named color-theme.el. + ;; Don't treat that as a theme. + (eq name 'color) (eq name 'cus) (eq name 'user) (eq name 'changed))))) === added directory 'lisp/themes' === added file 'lisp/themes/tango-dark-theme.el' --- lisp/themes/tango-dark-theme.el 1970-01-01 00:00:00 +0000 +++ lisp/themes/tango-dark-theme.el 2010-10-12 20:06:20 +0000 @@ -0,0 +1,92 @@ +;;; tango-dark-theme.el --- Tango-based custom theme for faces + +;; Copyright (C) 2010 Free Software Foundation, Inc. + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary + +;; The colors in this theme come from the Tango palette, which is in +;; the public domain: http://tango.freedesktop.org/ + +;;; Code: + +(deftheme tango-dark + "Theme for faces, based on the Tango palette on a dark background. +Basic, Font Lock, Isearch, Gnus, and Message faces are included.") + +(custom-theme-set-faces + 'tango-dark + '(default ((t (:foreground "#eeeeec" :background "#2e3436")))) + '(cursor ((t (:foreground "#2e3436" :background "#fce94f")))) + '(highlight ((t (:foreground "#2e3436" :background "#edd400")))) + '(region ((t (:background "#555753")))) + '(font-lock-builtin-face ((t (:foreground "#ad7fa8")))) + '(font-lock-comment-face ((t (:foreground "#73d216")))) + '(font-lock-constant-face ((t (:foreground "#e6a8df")))) + '(font-lock-function-name-face ((t (:foreground "#fce94f")))) + '(font-lock-keyword-face ((t (:foreground "#8cc4ff")))) + '(font-lock-string-face ((t (:foreground "#e9b96e")))) + '(font-lock-type-face ((t (:foreground "#a5ff4d")))) + '(font-lock-variable-name-face ((t (:foreground "#fcaf3e")))) + '(font-lock-warning-face ((t (:foreground "#ef2929")))) + '(button ((t (:underline t :foreground "#729fcf")))) + '(link ((t (:underline t :foreground "#729fcf")))) + '(link-visited ((t (:underline t :foreground "#3465a4")))) + '(mode-line ((t (:box (:line-width -1 :style released-button) + :background "#d3d7cf" :foreground "black")))) + '(mode-line-inactive ((t (:box (:line-width -1 :style released-button) + :background "#555753" :foreground "white")))) + '(isearch ((t (:foreground "#ffffff" :background "#ce5c00")))) + '(lazy-highlight ((t (:background "#8f5902")))) + '(gnus-group-news-1 ((t (:foreground "#ad7fa8")))) + '(gnus-group-news-1-low ((t (:foreground "#75507b")))) + '(gnus-group-news-2 ((t (:foreground "#729fcf")))) + '(gnus-group-news-2-low ((t (:foreground "#3465a4")))) + '(gnus-group-news-3 ((t (:foreground "#8ae234")))) + '(gnus-group-news-3-low ((t (:foreground "#73d216")))) + '(gnus-group-news-4 ((t (:foreground "#e9b9e6")))) + '(gnus-group-news-4-low ((t (:foreground "#c17d11")))) + '(gnus-group-news-5 ((t (:foreground "#fcaf3e")))) + '(gnus-group-news-5-low ((t (:foreground "#f57900")))) + '(gnus-group-news-low ((t (:foreground "#edd400")))) + '(gnus-group-mail-1 ((t (:foreground "#ad7fa8")))) + '(gnus-group-mail-1-low ((t (:foreground "#75507b")))) + '(gnus-group-mail-2 ((t (:foreground "#729fcf")))) + '(gnus-group-mail-2-low ((t (:foreground "#3465a4")))) + '(gnus-group-mail-3 ((t (:foreground "#8ae234")))) + '(gnus-group-mail-3-low ((t (:foreground "#73d216")))) + '(gnus-group-mail-low ((t (:foreground "#edd400")))) + '(gnus-header-content ((t (:weight normal :foreground "#c4a000")))) + '(gnus-header-from ((t (:foreground "#edd400")))) + '(gnus-header-subject ((t (:foreground "#8ae234")))) + '(gnus-header-name ((t (:foreground "#729fcf")))) + '(gnus-header-newsgroups ((t (:foreground "#c17d11")))) + '(message-header-name ((t (:foreground "#729fcf")))) + '(message-header-cc ((t (:foreground "#c4a000")))) + '(message-header-other ((t (:foreground "#c17d11")))) + '(message-header-subject ((t (:foreground "#8ae234")))) + '(message-header-to ((t (:foreground "#edd400")))) + '(message-cited-text ((t (:foreground "#8ae234")))) + '(message-separator ((t (:foreground "#ad7fa8"))))) + +(provide-theme 'tango-dark) + +;; Local Variables: +;; no-byte-compile: t +;; End: + +;;; tango-dark-theme.el ends here === added file 'lisp/themes/tango-theme.el' --- lisp/themes/tango-theme.el 1970-01-01 00:00:00 +0000 +++ lisp/themes/tango-theme.el 2010-10-12 20:06:20 +0000 @@ -0,0 +1,92 @@ +;;; tango-theme.el --- Tango-based custom theme for faces + +;; Copyright (C) 2010 Free Software Foundation, Inc. + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; Commentary + +;; The colors in this theme come from the Tango palette, which is in +;; the public domain: http://tango.freedesktop.org/ + +;;; Code: + +(deftheme tango + "Theme for faces, based on the Tango palette on a light background. +Basic, Font Lock, Isearch, Gnus, and Message faces are included.") + +(custom-theme-set-faces + 'tango + '(default ((t (:foreground "#16191a" :background "#eeeeec")))) + '(cursor ((t (:foreground "#eeeeec" :background "#204a87")))) + '(highlight ((t (:background "#babdb6")))) + '(region ((t (:background "#babdb6")))) + '(font-lock-builtin-face ((t (:weight bold :foreground "#204a87")))) + '(font-lock-comment-face ((t (:foreground "#204a87")))) + '(font-lock-constant-face ((t (:weight bold :foreground "#5c3566")))) + '(font-lock-function-name-face ((t (:weight bold :foreground "#ce5c00")))) + '(font-lock-keyword-face ((t (:foreground "#a40000")))) + '(font-lock-string-face ((t (:foreground "#5c3566")))) + '(font-lock-type-face ((t (:weight bold :foreground "#4e9a06")))) + '(font-lock-variable-name-face ((t (:weight bold :foreground "#c17d11")))) + '(font-lock-warning-face ((t (:foreground "#cc0000")))) + '(button ((t (:underline t :foreground "#204a87")))) + '(link ((t (:underline t :foreground "#204a87")))) + '(link-visited ((t (:underline t :foreground "#3465a4")))) + '(mode-line ((t (:box (:line-width -1 :style released-button) + :background "#d3d7cf" :foreground "black")))) + '(mode-line-inactive ((t (:box (:line-width -1 :style released-button) + :background "#babdb6" :foreground "black")))) + '(isearch ((t (:foreground "#ffffff" :background "#ce5c00")))) + '(lazy-highlight ((t (:background "#e9b96e")))) + '(gnus-group-news-1 ((t (:weight bold :foreground "#5c3566")))) + '(gnus-group-news-1-low ((t (:foreground "#5c3566")))) + '(gnus-group-news-2 ((t (:weight bold :foreground "#204a87")))) + '(gnus-group-news-2-low ((t (:foreground "#204a87")))) + '(gnus-group-news-3 ((t (:weight bold :foreground "#4e0a06")))) + '(gnus-group-news-3-low ((t (:foreground "#4e0a06")))) + '(gnus-group-news-4 ((t (:weight bold :foreground "#7a4c02")))) + '(gnus-group-news-4-low ((t (:foreground "#7a4c02")))) + '(gnus-group-news-5 ((t (:weight bold :foreground "#ce5c00")))) + '(gnus-group-news-5-low ((t (:foreground "#ce5c00")))) + '(gnus-group-news-low ((t (:foreground "#888a85")))) + '(gnus-group-mail-1 ((t (:weight bold :foreground "#5c3566")))) + '(gnus-group-mail-1-low ((t (:foreground "#5c3566")))) + '(gnus-group-mail-2 ((t (:weight bold :foreground "#204a87")))) + '(gnus-group-mail-2-low ((t (:foreground "#204a87")))) + '(gnus-group-mail-3 ((t (:weight bold :foreground "#4e0a06")))) + '(gnus-group-mail-3-low ((t (:foreground "#4e0a06")))) + '(gnus-group-mail-low ((t (:foreground "#888a85")))) + '(gnus-header-content ((t (:foreground "#4e9a06")))) + '(gnus-header-from ((t (:weight bold :foreground "#c4a000")))) + '(gnus-header-subject ((t (:foreground "#4e0a06")))) + '(gnus-header-name ((t (:foreground "#204a87")))) + '(gnus-header-newsgroups ((t (:foreground "#888a85")))) + '(message-header-name ((t (:foreground "#204a87")))) + '(message-header-cc ((t (:foreground "#c4a000")))) + '(message-header-other ((t (:foreground "#c17d11")))) + '(message-header-subject ((t (:foreground "#4e0a06")))) + '(message-header-to ((t (:weight bold :foreground "#c4a000")))) + '(message-cited-text ((t (:foreground "#888a85")))) + '(message-separator ((t (:weight bold :foreground "#4e9a06"))))) + +(provide-theme 'tango) + +;; Local Variables: +;; no-byte-compile: t +;; End: + +;;; tango-theme.el ends here === added file 'lisp/themes/wheatgrass-theme.el' --- lisp/themes/wheatgrass-theme.el 1970-01-01 00:00:00 +0000 +++ lisp/themes/wheatgrass-theme.el 2010-10-12 20:06:20 +0000 @@ -0,0 +1,66 @@ +;;; wheatgrass-theme.el --- custom theme for faces + +;; Copyright (C) 2010 Free Software Foundation, Inc. + +;; This file is part of GNU Emacs. + +;; GNU Emacs is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. + +;; GNU Emacs is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. + +;; You should have received a copy of the GNU General Public License +;; along with GNU Emacs. If not, see . + +;;; 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.") + +(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"))))) + +(provide-theme 'wheatgrass) + +;; Local Variables: +;; no-byte-compile: t +;; End: + +;;; wheatgrass-theme.el ends here ------------------------------------------------------------ revno: 101936 committer: Dan Nicolaescu branch nick: trunk timestamp: Tue 2010-10-12 07:37:33 -0700 message: Avoid using trailing / in directory variables. * src/Makefile.in (lispsource, libsrc, etc, oldxmenudir, lwlibdir) (lispdir): Remove trailing /, update all uses. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-11 23:57:49 +0000 +++ src/ChangeLog 2010-10-12 14:37:33 +0000 @@ -1,3 +1,8 @@ +2010-10-12 Dan Nicolaescu + + * Makefile.in (lispsource, libsrc, etc, oldxmenudir, lwlibdir) + (lispdir): Remove trailing /, update all uses. + 2010-10-12 Jan Djärv * nsterm.m (Qleft): Declare. === modified file 'src/Makefile.in' --- src/Makefile.in 2010-10-10 15:35:04 +0000 +++ src/Makefile.in 2010-10-12 14:37:33 +0000 @@ -46,12 +46,12 @@ # LIBS = @LIBS@ LIBOBJS = @LIBOBJS@ -lispsource = $(srcdir)/../lisp/ -libsrc = ../lib-src/ -etc = ../etc/ -oldXMenudir = ../oldXMenu/ -lwlibdir = ../lwlib/ -lispdir = ../lisp/ +lispsource = $(srcdir)/../lisp +libsrc = ../lib-src +etc = ../etc +oldXMenudir = ../oldXMenu +lwlibdir = ../lwlib +lispdir = ../lisp # Configuration files for .o files to depend on. M_FILE = $(srcdir)/@machfile@ @@ -176,8 +176,8 @@ OLDXMENU_TARGET=@OLDXMENU_TARGET@ ## If !HAVE_X11 || USE_GTK, empty. -## Else if USE_X_TOOLKIT, $(lwlibdir)liblw.a. -## Else $(oldxmenudir)libXMenu11.a. +## Else if USE_X_TOOLKIT, $(lwlibdir)/liblw.a. +## Else $(oldxmenudir)/libXMenu11.a. ## (Actually, rather than being empty, it is set to "nothing". ## It is never actually used for anything in this case. ## This is done because there is a rule with target $(OLDXMENU) below, @@ -237,9 +237,9 @@ MSDOS_OBJ = ## w16select.o termcap.o if MSDOS && HAVE_X_WINDOWS. MSDOS_X_OBJ = -MSDOS_SUPPORT_REAL = $(lispsource)ls-lisp.elc $(lispsource)disp-table.elc \ - $(lispsource)dos-fns.elc $(lispsource)dos-w32.elc $(lispsource)dos-vars.elc \ - $(lispsource)term/internal.elc $(lispsource)term/pc-win.elc +MSDOS_SUPPORT_REAL = $(lispsource)/ls-lisp.elc $(lispsource)/disp-table.elc \ + $(lispsource)/dos-fns.elc $(lispsource)/dos-w32.elc $(lispsource)/dos-vars.elc \ + $(lispsource)/term/internal.elc $(lispsource)/term/pc-win.elc ## $MSDOS_SUPPORT_REAL if MSDOS. MSDOS_SUPPORT = @@ -258,23 +258,23 @@ FONT_OBJ=@FONT_OBJ@ ## Used if HAVE_MOUSE. -REAL_MOUSE_SUPPORT=$(lispsource)mouse.elc $(lispsource)select.elc \ - $(lispsource)scroll-bar.elc +REAL_MOUSE_SUPPORT=$(lispsource)/mouse.elc $(lispsource)/select.elc \ + $(lispsource)/scroll-bar.elc ## Used if HAVE_GPM && !HAVE_MOUSE -GPM_MOUSE_SUPPORT=$(lispsource)mouse.elc +GPM_MOUSE_SUPPORT=$(lispsource)/mouse.elc LIBGPM = @LIBGPM@ ## Either of the two preceding options, or empty. MOUSE_SUPPORT=@MOUSE_SUPPORT@ -## $(lispsource)tooltip.elc if HAVE_WINDOW_SYSTEM, else empty. +## $(lispsource)/tooltip.elc if HAVE_WINDOW_SYSTEM, else empty. TOOLTIP_SUPPORT=@TOOLTIP_SUPPORT@ -BASE_WINDOW_SUPPORT=$(lispsource)fringe.elc $(lispsource)image.elc \ - $(lispsource)international/fontset.elc $(lispsource)dnd.elc \ - $(lispsource)tool-bar.elc $(lispsource)mwheel.elc +BASE_WINDOW_SUPPORT=$(lispsource)/fringe.elc $(lispsource)/image.elc \ + $(lispsource)/international/fontset.elc $(lispsource)/dnd.elc \ + $(lispsource)/tool-bar.elc $(lispsource)/mwheel.elc -X_WINDOW_SUPPORT=$(lispsource)x-dnd.elc $(lispsource)term/common-win.elc \ - $(lispsource)term/x-win.elc $(lispsource)dynamic-setting.elc +X_WINDOW_SUPPORT=$(lispsource)/x-dnd.elc $(lispsource)/term/common-win.elc \ + $(lispsource)/term/x-win.elc $(lispsource)/dynamic-setting.elc ## If HAVE_X_WINDOWS, both the above ## else if HAVE_WINDOW_SYSTEM (ie, HAVE_NS) just the former; else empty. @@ -397,93 +397,93 @@ ## Place loaddefs.el first, so it gets generated first, since it is on ## the critical path (relevant in parallel compilations). lisp= \ - $(lispsource)loaddefs.el \ - $(lispsource)abbrev.elc \ - $(lispsource)buff-menu.elc \ - $(lispsource)button.elc \ - $(lispsource)emacs-lisp/byte-run.elc \ - $(lispsource)composite.elc \ - $(lispsource)cus-face.elc \ - $(lispsource)cus-start.elc \ - $(lispsource)custom.elc \ - $(lispsource)emacs-lisp/backquote.elc \ - $(lispsource)emacs-lisp/lisp-mode.elc \ - $(lispsource)emacs-lisp/lisp.elc \ - $(lispsource)env.elc \ - $(lispsource)faces.elc \ - $(lispsource)files.elc \ - $(lispsource)format.elc \ - $(lispsource)facemenu.elc \ + $(lispsource)/loaddefs.el \ + $(lispsource)/abbrev.elc \ + $(lispsource)/buff-menu.elc \ + $(lispsource)/button.elc \ + $(lispsource)/emacs-lisp/byte-run.elc \ + $(lispsource)/composite.elc \ + $(lispsource)/cus-face.elc \ + $(lispsource)/cus-start.elc \ + $(lispsource)/custom.elc \ + $(lispsource)/emacs-lisp/backquote.elc \ + $(lispsource)/emacs-lisp/lisp-mode.elc \ + $(lispsource)/emacs-lisp/lisp.elc \ + $(lispsource)/env.elc \ + $(lispsource)/faces.elc \ + $(lispsource)/files.elc \ + $(lispsource)/format.elc \ + $(lispsource)/facemenu.elc \ $(MOUSE_SUPPORT) \ - $(lispsource)emacs-lisp/float-sup.elc \ - $(lispsource)frame.elc \ - $(lispsource)help.elc \ - $(lispsource)indent.elc \ - $(lispsource)isearch.elc \ - $(lispsource)rfn-eshadow.elc \ - $(lispsource)loadup.el \ - $(lispsource)bindings.elc \ - $(lispsource)emacs-lisp/map-ynp.elc \ - $(lispsource)menu-bar.elc \ - $(lispsource)international/mule.elc \ - $(lispsource)international/mule-conf.elc \ - $(lispsource)international/mule-cmds.elc \ - $(lispsource)international/characters.elc \ - $(lispsource)international/charprop.el \ - $(lispsource)case-table.elc \ - $(lispsource)language/chinese.elc \ - $(lispsource)language/cyrillic.elc \ - $(lispsource)language/indian.elc \ - $(lispsource)language/sinhala.el \ - $(lispsource)language/english.el \ - $(lispsource)language/ethiopic.elc \ - $(lispsource)language/european.elc \ - $(lispsource)language/czech.el \ - $(lispsource)language/slovak.el \ - $(lispsource)language/romanian.el \ - $(lispsource)language/greek.el \ - $(lispsource)language/hebrew.elc \ - $(lispsource)language/japanese.el \ - $(lispsource)language/korean.el \ - $(lispsource)language/lao.el \ - $(lispsource)language/cham.el \ - $(lispsource)language/tai-viet.el \ - $(lispsource)language/thai.el \ - $(lispsource)language/tibetan.elc \ - $(lispsource)language/vietnamese.elc \ - $(lispsource)language/misc-lang.el \ - $(lispsource)language/utf-8-lang.el \ - $(lispsource)language/georgian.el \ - $(lispsource)language/khmer.el \ - $(lispsource)language/burmese.el \ - $(lispsource)paths.el \ - $(lispsource)register.elc \ - $(lispsource)replace.elc \ - $(lispsource)simple.elc \ - $(lispsource)minibuffer.elc \ - $(lispsource)startup.elc \ - $(lispsource)subr.elc \ - $(lispsource)term/tty-colors.elc \ - $(lispsource)font-core.elc \ - $(lispsource)emacs-lisp/syntax.elc \ - $(lispsource)font-lock.elc \ - $(lispsource)jit-lock.elc \ - $(lispsource)textmodes/fill.elc \ - $(lispsource)textmodes/page.elc \ - $(lispsource)textmodes/paragraphs.elc \ - $(lispsource)textmodes/text-mode.elc \ - $(lispsource)emacs-lisp/timer.elc \ - $(lispsource)jka-cmpr-hook.elc \ - $(lispsource)vc/vc-hooks.elc \ - $(lispsource)vc/ediff-hook.elc \ - $(lispsource)epa-hook.elc \ + $(lispsource)/emacs-lisp/float-sup.elc \ + $(lispsource)/frame.elc \ + $(lispsource)/help.elc \ + $(lispsource)/indent.elc \ + $(lispsource)/isearch.elc \ + $(lispsource)/rfn-eshadow.elc \ + $(lispsource)/loadup.el \ + $(lispsource)/bindings.elc \ + $(lispsource)/emacs-lisp/map-ynp.elc \ + $(lispsource)/menu-bar.elc \ + $(lispsource)/international/mule.elc \ + $(lispsource)/international/mule-conf.elc \ + $(lispsource)/international/mule-cmds.elc \ + $(lispsource)/international/characters.elc \ + $(lispsource)/international/charprop.el \ + $(lispsource)/case-table.elc \ + $(lispsource)/language/chinese.elc \ + $(lispsource)/language/cyrillic.elc \ + $(lispsource)/language/indian.elc \ + $(lispsource)/language/sinhala.el \ + $(lispsource)/language/english.el \ + $(lispsource)/language/ethiopic.elc \ + $(lispsource)/language/european.elc \ + $(lispsource)/language/czech.el \ + $(lispsource)/language/slovak.el \ + $(lispsource)/language/romanian.el \ + $(lispsource)/language/greek.el \ + $(lispsource)/language/hebrew.elc \ + $(lispsource)/language/japanese.el \ + $(lispsource)/language/korean.el \ + $(lispsource)/language/lao.el \ + $(lispsource)/language/cham.el \ + $(lispsource)/language/tai-viet.el \ + $(lispsource)/language/thai.el \ + $(lispsource)/language/tibetan.elc \ + $(lispsource)/language/vietnamese.elc \ + $(lispsource)/language/misc-lang.el \ + $(lispsource)/language/utf-8-lang.el \ + $(lispsource)/language/georgian.el \ + $(lispsource)/language/khmer.el \ + $(lispsource)/language/burmese.el \ + $(lispsource)/paths.el \ + $(lispsource)/register.elc \ + $(lispsource)/replace.elc \ + $(lispsource)/simple.elc \ + $(lispsource)/minibuffer.elc \ + $(lispsource)/startup.elc \ + $(lispsource)/subr.elc \ + $(lispsource)/term/tty-colors.elc \ + $(lispsource)/font-core.elc \ + $(lispsource)/emacs-lisp/syntax.elc \ + $(lispsource)/font-lock.elc \ + $(lispsource)/jit-lock.elc \ + $(lispsource)/textmodes/fill.elc \ + $(lispsource)/textmodes/page.elc \ + $(lispsource)/textmodes/paragraphs.elc \ + $(lispsource)/textmodes/text-mode.elc \ + $(lispsource)/emacs-lisp/timer.elc \ + $(lispsource)/jka-cmpr-hook.elc \ + $(lispsource)/vc/vc-hooks.elc \ + $(lispsource)/vc/ediff-hook.elc \ + $(lispsource)/epa-hook.elc \ $(TOOLTIP_SUPPORT) \ $(MSDOS_SUPPORT) \ $(WINDOW_SUPPORT) \ $(NS_SUPPORT) \ - $(lispsource)widget.elc \ - $(lispsource)window.elc \ - $(lispsource)version.el + $(lispsource)/widget.elc \ + $(lispsource)/window.elc \ + $(lispsource)/version.el ## List of relative names for those files from $lisp that are loaded ## unconditionally (i.e. on all platforms). Files from $lisp that @@ -610,7 +610,7 @@ ## Does anyone ever pay attention to the load-path-shadows output here? ## The dumped Emacs is as functional and more efficient than ## bootstrap-emacs, so we replace the latter with the former. -emacs$(EXEEXT): temacs$(EXEEXT) $(etc)DOC $(lisp) +emacs$(EXEEXT): temacs$(EXEEXT) $(etc)/DOC $(lisp) if test "$(CANNOT_DUMP)" = "yes"; then \ ln -f temacs$(EXEEXT) emacs$(EXEEXT); \ EMACSLOADPATH=$(lispsource) ./emacs -q -batch \ @@ -634,12 +634,12 @@ ## the Makefile uses string equality to decide when we talk about identical ## files. Apparently we pass $(shortlisp) rather than $(lisp) to make-docfile ## only in order to reduce the command line length. --Stef -$(etc)DOC: $(libsrc)make-docfile$(EXEEXT) $(obj) $(lisp) $(SOME_MACHINE_LISP) - -rm -f $(etc)DOC - $(libsrc)make-docfile -d $(srcdir) $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)DOC - $(libsrc)make-docfile -a $(etc)DOC -d $(srcdir) $(SOME_MACHINE_LISP) $(shortlisp) +$(etc)/DOC: $(libsrc)/make-docfile$(EXEEXT) $(obj) $(lisp) $(SOME_MACHINE_LISP) + -rm -f $(etc)/DOC + $(libsrc)/make-docfile -d $(srcdir) $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)/DOC + $(libsrc)/make-docfile -a $(etc)/DOC -d $(srcdir) $(SOME_MACHINE_LISP) $(shortlisp) -$(libsrc)make-docfile$(EXEEXT): +$(libsrc)/make-docfile$(EXEEXT): cd $(libsrc); $(MAKE) $(MFLAGS) make-docfile$(EXEEXT) buildobj.h: Makefile @@ -737,12 +737,12 @@ $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) frc: TAGS-LISP: frc - $(MAKE) -f $(lispdir)Makefile TAGS-LISP ETAGS=../lib-src/etags - -$(lwlibdir)TAGS: - (cd $(lwlibdir); $(MAKE) -f $(lwlibdir)Makefile tags ETAGS=../lib-src/etags) - -tags: TAGS TAGS-LISP $(lwlibdir)TAGS + $(MAKE) -f $(lispdir)/Makefile TAGS-LISP ETAGS=../lib-src/etags + +$(lwlibdir)/TAGS: + (cd $(lwlibdir); $(MAKE) -f $(lwlibdir)/Makefile tags ETAGS=../lib-src/etags) + +tags: TAGS TAGS-LISP $(lwlibdir)/TAGS .PHONY: tags @@ -784,7 +784,7 @@ ## VCSWITNESS points to the file that holds info about the current checkout. ## We use it as a heuristic to decide when to rebuild loaddefs.el. -$(lispsource)loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS) +$(lispsource)/loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS) cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS=$(bootstrap_exe) ## Dump an Emacs executable named bootstrap-emacs containing the ------------------------------------------------------------ revno: 101935 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2010-10-12 14:17:15 +0000 message: gnus-sum.el: Remove long obsoleted functions. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-12 00:25:50 +0000 +++ lisp/gnus/ChangeLog 2010-10-12 14:17:15 +0000 @@ -1,3 +1,9 @@ +2010-10-12 Lars Magne Ingebrigtsen + + * gnus-sum.el (gnus-summary-mark-as-unread-forward) + (gnus-summary-mark-as-unread-backward, gnus-summary-mark-as-unread): + Remove long obsoleted functions. + 2010-10-11 Katsumi Yamaoka * nnimap.el (gnutls-negotiate): Silence the byte compiler. === modified file 'lisp/gnus/gnus-kill.el' --- lisp/gnus/gnus-kill.el 2010-09-18 10:02:19 +0000 +++ lisp/gnus/gnus-kill.el 2010-10-12 14:17:15 +0000 @@ -480,7 +480,7 @@ (or (cdr (assq modifier mod-to-header)) "subject") pattern (if (string-match "m" commands) - '(gnus-summary-mark-as-unread nil " ") + '(gnus-summary-tick-article nil " ") '(gnus-summary-mark-as-read nil "X")) nil t)) (forward-line 1)))) === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2010-10-11 23:29:33 +0000 +++ lisp/gnus/gnus-sum.el 2010-10-12 14:17:15 +0000 @@ -10853,10 +10853,6 @@ (gnus-alist-pull article gnus-newsgroup-reads) t))) -(defalias 'gnus-summary-mark-as-unread-forward - 'gnus-summary-tick-article-forward) -(make-obsolete 'gnus-summary-mark-as-unread-forward - 'gnus-summary-tick-article-forward "Emacs 20.4") (defun gnus-summary-tick-article-forward (n) "Tick N articles forwards. If N is negative, tick backwards instead. @@ -10864,18 +10860,12 @@ (interactive "p") (gnus-summary-mark-forward n gnus-ticked-mark)) -(defalias 'gnus-summary-mark-as-unread-backward - 'gnus-summary-tick-article-backward) -(make-obsolete 'gnus-summary-mark-as-unread-backward - 'gnus-summary-tick-article-backward "Emacs 20.4") (defun gnus-summary-tick-article-backward (n) "Tick N articles backwards. The difference between N and the number of articles ticked is returned." (interactive "p") (gnus-summary-mark-forward (- n) gnus-ticked-mark)) -(defalias 'gnus-summary-mark-as-unread 'gnus-summary-tick-article) -(make-obsolete 'gnus-summary-mark-as-unread 'gnus-summary-tick-article "Emacs 20.4") (defun gnus-summary-tick-article (&optional article clear-mark) "Mark current article as unread. Optional 1st argument ARTICLE specifies article number to be marked as unread. ------------------------------------------------------------ revno: 101934 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-12 01:05:28 -0700 message: * make-dist: Replace grep with sed when determining $version. diff: === modified file 'make-dist' --- make-dist 2010-10-12 08:01:11 +0000 +++ make-dist 2010-10-12 08:05:28 +0000 @@ -153,8 +153,7 @@ fi ### Find out which version of Emacs this is. -version=`grep 'char emacs_version' src/emacs.c \ - | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'` +version=`sed -n '/char emacs_version/ s/^[^"]*"\([^"]*\)".*$/\1/p' src/emacs.c` if [ ! "${version}" ]; then echo "${progname}: can't find current Emacs version in \`./src/emacs.c'" >&2 exit 1 ------------------------------------------------------------ revno: 101933 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-12 01:01:11 -0700 message: * make-dist: Remove the unnecessary $shortversion. diff: === modified file 'make-dist' --- make-dist 2010-10-12 07:46:57 +0000 +++ make-dist 2010-10-12 08:01:11 +0000 @@ -153,8 +153,6 @@ fi ### Find out which version of Emacs this is. -shortversion=`grep 'char emacs_version' src/emacs.c \ - | sed -e 's/^.*"\([0-9][0-9]*\.[0-9][0-9]*\).*$/\1/'` version=`grep 'char emacs_version' src/emacs.c \ | sed -e 's/^[^"]*"\([^"]*\)".*$/\1/'` if [ ! "${version}" ]; then @@ -162,11 +160,11 @@ exit 1 fi -echo Version numbers are $version and $shortversion +echo Version number is $version if [ $update = yes ]; then - if grep -s "@set EMACSVER *${shortversion}" ./doc/emacs/emacsver.texi > /dev/null; then + if grep -s "@set EMACSVER *${version}" ./doc/emacs/emacsver.texi > /dev/null; then true else echo "You must update the version number in \`./doc/emacs/emacsver.texi'" ------------------------------------------------------------ revno: 101932 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-12 00:46:57 -0700 message: * make-dist: Remove comment that no longer applies. diff: === modified file 'make-dist' --- make-dist 2010-10-12 07:44:12 +0000 +++ make-dist 2010-10-12 07:46:57 +0000 @@ -453,7 +453,6 @@ ln ChangeLog INSTALL README emacs.ico emacs.pif ../${tempdir}/msdos ln is_exec.c sigaction.c mainmake.v2 sed*.inp ../${tempdir}/msdos) -## FIXME are DEV-NOTES and FOR-RELEASE appropriate? echo "Making links to \`nextstep'" (cd nextstep ln AUTHORS ChangeLog README INSTALL ../${tempdir}/nextstep) ------------------------------------------------------------ revno: 101931 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-12 00:44:12 -0700 message: * make-dist: Simplify trap handling. diff: === modified file 'make-dist' --- make-dist 2010-10-12 07:31:58 +0000 +++ make-dist 2010-10-12 07:44:12 +0000 @@ -299,7 +299,7 @@ ### This trap ensures that the staging directory will be cleaned up even ### when the script is interrupted in mid-career. if [ "${clean_up}" = yes ]; then - trap "echo 'Interrupted...cleaning up the staging directory'; rm -rf ${tempparent}; exit 1" 1 2 15 + trap "echo 'Cleaning up the staging directory'; rm -rf ${tempparent}" EXIT fi echo "Creating top directory: \`${tempdir}'" @@ -571,10 +571,7 @@ > ${emacsname}.tar${gzip_extension} fi -if [ "${clean_up}" = yes ]; then - echo "Cleaning up the staging directory" - rm -rf ${tempparent} -else +if [ "${clean_up}" != yes ]; then (cd ${tempparent}; mv ${emacsname} ..) rm -rf ${tempparent} fi ------------------------------------------------------------ revno: 101930 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-12 00:31:58 -0700 message: * make-dist: Use find for the whole etc/ directory. diff: === modified file 'make-dist' --- make-dist 2010-10-12 07:27:07 +0000 +++ make-dist 2010-10-12 07:31:58 +0000 @@ -488,27 +488,11 @@ ln *.[ch] *.in ../${tempdir}/lwlib ln README ChangeLog ../${tempdir}/lwlib) -echo "Making links to \`etc'" -(cd etc - for f in *; do - [ -f "$f" ] || continue - case "$f" in - DOC*) continue ;; - esac - ln $f ../${tempdir}/etc - done) - -for dir in etc/*/; do - case "$dir" in - etc/images/) continue ;; - esac - echo "Making links to \`${dir}'" - (cd ${dir} - ln * ../../${tempdir}/${dir}) -done - -echo "Making links to \`etc/images' and its subdirectories" -for f in `find etc/images -type f`; do +echo "Making links to \`etc' and its subdirectories" +for f in `find etc -type f`; do + case $f in + etc/DOC*) continue ;; + esac ln $f $tempdir/$f done ------------------------------------------------------------ revno: 101929 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-12 00:27:07 -0700 message: * make-dist: Use find for etc/image files. diff: === modified file 'make-dist' --- make-dist 2010-10-12 07:09:39 +0000 +++ make-dist 2010-10-12 07:27:07 +0000 @@ -507,38 +507,9 @@ ln * ../../${tempdir}/${dir}) done -echo "Making links to \`etc/images'" -(cd etc/images - for f in *; do - [ -f "$f" ] || continue - ln $f ../../${tempdir}/etc/images - done) - -for dir in etc/images/*/; do - echo "Making links to \`${dir}'" - (cd ${dir} - for f in *; do - [ -f "$f" ] || continue - ln $f ../../../${tempdir}/${dir} - done - ) -done - -for dir in etc/images/*/*/; do - case "$dir" in - etc/images/icons/hicolor/) continue ;; - esac - echo "Making links to \`${dir}'" - (cd ${dir} - ln `ls -d *` ../../../../${tempdir}/${dir}) -done - -for dir in etc/images/icons/hicolor/*/apps \ - etc/images/icons/hicolor/*/mimetypes; do - echo "Making links to \`${dir}'" - (cd ${dir} - ln `ls -d *` ../../../../../../${tempdir}/${dir} - cd ../../../../../../${tempdir}/${dir}) +echo "Making links to \`etc/images' and its subdirectories" +for f in `find etc/images -type f`; do + ln $f $tempdir/$f done echo "Making links to \`info'" ------------------------------------------------------------ revno: 101928 committer: Glenn Morris branch nick: trunk timestamp: Tue 2010-10-12 00:09:39 -0700 message: * make-dist: Use find to handle the etc and lisp directories. diff: === modified file 'make-dist' --- make-dist 2010-10-12 06:38:34 +0000 +++ make-dist 2010-10-12 07:09:39 +0000 @@ -327,22 +327,14 @@ echo "Creating subdirectories" -for subdir in lisp site-lisp \ +for subdir in site-lisp \ leim leim/CXTERM-DIC leim/MISC-DIC \ leim/SKK-DIC leim/ja-dic leim/quail \ src src/m src/s src/bitmaps lib-src oldXMenu lwlib \ nt nt/inc nt/inc/sys nt/inc/arpa nt/inc/netinet nt/icons \ - etc etc/charsets etc/e etc/gnus etc/nxml \ - etc/images etc/images/custom etc/images/ezimage etc/images/gnus \ - etc/images/gud etc/images/icons etc/images/icons/hicolor \ - etc/images/icons/hicolor/*x* etc/images/icons/hicolor/scalable \ - etc/images/icons/hicolor/*/apps etc/images/icons/hicolor/*/mimetypes \ - etc/images/low-color etc/images/mail etc/images/mpc \ - etc/images/smilies etc/images/smilies/grayscale \ - etc/images/smilies/medium etc/images/tree-widget \ - etc/images/tree-widget/default etc/images/tree-widget/folder \ - etc/refcards etc/schema etc/srecode etc/tutorials info doc doc/emacs \ - doc/misc doc/man doc/lispref doc/lispintro m4 msdos \ + `find etc lisp -type d` \ + doc doc/emacs doc/misc doc/man doc/lispref doc/lispintro \ + info m4 msdos \ nextstep nextstep/Cocoa nextstep/Cocoa/Emacs.base \ nextstep/Cocoa/Emacs.base/Contents \ nextstep/Cocoa/Emacs.base/Contents/Resources \ @@ -360,45 +352,16 @@ done echo "Making links to \`lisp' and its subdirectories" +files=`find lisp \( -name '*.el' -o -name '*.elc' -o -name 'ChangeLog*' \ + -o -name 'README*' \)` + ### Don't distribute site-init.el, site-load.el, or default.el. -(cd lisp - ln [a-zA-Z]*.el ../${tempdir}/lisp - ln [a-zA-Z]*.elc ../${tempdir}/lisp - ln ChangeLog ChangeLog.*[0-9] ../${tempdir}/lisp - ln Makefile.in makefile.w32-in ../${tempdir}/lisp - ln README ../${tempdir}/lisp - (cd ../${tempdir}/lisp - rm -f site-init site-init.el site-init.elc - rm -f site-load site-load.el site-load.elc - rm -f site-start site-start.el site-start.elc - rm -f default default.el default.elc - ) - - ## Find all subdirs of lisp dir - for file in `find . -type d -print`; do - case $file in - . | .. | */=*) - ;; - *) - if [ -d $file ]; then - subdirs="$file $subdirs" - fi - ;; - esac - done - - for file in $subdirs; do - echo " lisp/$file" - mkdir -p ../${tempdir}/lisp/$file - ln $file/[a-zA-Z0-9]*.el ../${tempdir}/lisp/$file - ln $file/[a-zA-Z0-9]*.elc ../${tempdir}/lisp/$file - ## calc/README.prev - for f in $file/README $file/ChangeLog $file/ChangeLog.*[0-9] \ - $file/README.prev; do - [ -f $f ] || continue - ln $f ../${tempdir}/lisp/$file - done - done ) +for file in lisp/Makefile.in lisp/makefile.w32-in $files; do + case $file in + */site-init*|*/site-load*|*/default*) continue ;; + esac + ln $file $tempdir/$file +done echo "Making links to \`leim' and its subdirectories" (cd leim @@ -419,8 +382,8 @@ rm -f ../${tempdir}/leim/quail/tsang-cns.*) echo "Making links to \`src'" -### Don't distribute =*.[ch] files, or the configured versions of -### config.in, paths.in, or Makefile.in, or TAGS. +### Don't distribute the configured versions of +### config.in, paths.in, buildobj.h, or Makefile.in. (cd src echo " (It is ok if ln fails in some cases.)" ln [a-zA-Z]*.[chm] ../${tempdir}/src ------------------------------------------------------------ revno: 101927 committer: Glenn Morris branch nick: trunk timestamp: Mon 2010-10-11 23:38:34 -0700 message: * make-dist: Simplify creation of lisp/MANIFEST. diff: === modified file 'make-dist' --- make-dist 2010-10-12 04:32:20 +0000 +++ make-dist 2010-10-12 06:38:34 +0000 @@ -279,21 +279,17 @@ $EMACS -batch -f batch-byte-recompile-directory lisp leim fi +## What is this file for? It goes in srcdir, not the tarfile. +## Why does it exclude term/ ? echo "Making lisp/MANIFEST" -(cd lisp; - files=`echo [!=]*.el | sed -e 's/ subdirs.el / /' -e 's/ default.el / /'` - for dir in [!=]*; do - if [ -d $dir ] && [ $dir != term ] - then - echo $dir - thisdir=`echo $dir/[!=]*.el | sed -e 's/ subdirs.el / /'` - files="$files $thisdir" - fi - done - for file in $files - do sed -n 's/^;;; //p; q' $file - done | sort > MANIFEST) +files=`find lisp -type f -name '*.el'` +for file in $files; do + case "$file" in + */subdirs.el|*/default.el|*/loaddefs.el|*/term/*) continue ;; + esac + sed -n 's/^;;; //p; q' $file +done | sort > lisp/MANIFEST echo "Creating staging directory: \`${tempparent}'" @@ -319,6 +315,8 @@ ln config.bat make-dist update-subdirs vpath.sed .dir-locals.el ${tempdir} ln mkinstalldirs config.sub config.guess install-sh ${tempdir} +## FIXME why do we bother doing this? set-version in admin/admin.el +## does this, and more besides. echo "Updating version number in README" (cd ${tempdir} awk \ @@ -448,7 +446,7 @@ echo "Making links to \`lib-src'" (cd lib-src - ln [a-zA-Z]*.[chmy] ../${tempdir}/lib-src + ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src ln ChangeLog Makefile.in README testfile vcdiff ../${tempdir}/lib-src ln grep-changelog rcs2log rcs-checkin ../${tempdir}/lib-src ln makefile.w32-in ../${tempdir}/lib-src