Merge from trunk

5 files changed, 106 insertions, 95 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index db1c5d41c34..45dfb211bb0 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+	format-time-string now supports subsecond time stamp resolution
+	* NEWS: Document this.
+
 2011-01-28  Paul Eggert  <eggert@cs.ucla.edu>
 
 	Redo spelling of Makefile variables to conform to POSIX.
diff --git a/etc/NEWS b/etc/NEWS
index a20ecd4fe7f..11425c21342 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -169,6 +169,10 @@ get and set the SELinux context of a file.
 *** Tramp offers handlers for file-selinux-context and set-file-selinux-context
 for remote machines which support SELinux.
 
++++
+** The function format-time-string now supports the %N directive, for
+higher-resolution time stamps.
+
 ** The function kill-emacs is now run upon receipt of the signals SIGTERM
 and SIGHUP, and upon SIGINT in batch mode.
 
@@ -558,9 +562,9 @@ listing object name completions when being sent text via
 
 ** sregex.el is now obsolete, since rx.el is a strict superset.
 
-** s-region.el is now declared obsolete, superceded by shift-select-mode
-enabled by default in 23.1.
-
+** s-region.el and pc-select are now declared obsolete,
+superceded by shift-select-mode enabled by default in 23.1.
+** pc-mode.el is also declared obsolete.
 ** gdb-mi
 
 *** GDB User Interface migrated to GDB Machine Interface and now
@@ -593,7 +597,7 @@ The vc-pull command runs a "pull" operation, if it is supported.
 This updates the current branch from upstream.  A prefix argument
 means to prompt the user for specifics, e.g. a pull location.
 
-**** vc-update is now an alias for vc-update.
+**** `vc-update' is now an alias for `vc-pull'.
 
 **** Currently supported by Bzr, Git, and Mercurial.
 
diff --git a/etc/NEWS.23 b/etc/NEWS.23
index 22c0b1de19c..6b6cbe48328 100644
--- a/etc/NEWS.23
+++ b/etc/NEWS.23
@@ -17,28 +17,52 @@ with a prefix argument or by typing C-u C-h C-n.
 
 * Installation Changes in Emacs 23.3
 
-* Startup Changes in Emacs 23.3
+** New configure option --with-crt-dir specifies the location of your
+crt*.o files, if they are in a non-standard location.  This is only
+used on x86-64 and s390x GNU/Linux architectures.
 
 * Changes in Emacs 23.3
 
-+++
 ** The last-resort backup file `%backup%~' is now written to
 `user-emacs-directory', instead of the user's home directory.
 
-
-* Editing Changes in Emacs 23.3
+** If Emacs creates `user-emacs-directory', that directory's
+permissions are now set to rwx------, ignoring the umask.
 
 
 * Changes in Specialized Modes and Packages in Emacs 23.3
 
----
-** The appt-add command takes an optional argument for the warning time.
+** Calendar and diary
+
+*** The appt-add command takes an optional argument, the warning time.
 This can be used in place of the default appt-message-warning-time.
 
----
-** You can allow inferior Python processes to load modules from the
+** Python mode
+
+*** You can allow inferior Python processes to load modules from the
 current directory by setting `python-remove-cwd-from-path' to nil.
 
+** Rmail
+
+*** The default value of `rmail-enable-mime' is now t.  Rmail decodes
+MIME contents automatically.  You can customize the variable
+`rmail-enable-mime' back to `nil' to disable this automatic MIME
+decoding.
+
+*** The command `rmail-mime' change the displaying of a MIME message
+between decoded presentation form and raw data if `rmail-enable-mime'
+is non-nil.  And, with prefix argument, it change only the displaying
+of the MIME entity at point.
+
+*** The new command `rmail-mime-next-item' (bound to TAB) moves point
+to the next item of MIME message.
+
+*** The new command `rmail-mime-previous-item' (bound to backtab) moves
+point to the previous item of MIME message.
+
+*** The new command `rmail-mime-toggle-hidden' (RET) hide or show the
+body of the MIME entity at point.
+
 ** VC and related modes
 
 *** New VC command `vc-log-incoming', bound to `C-x v I'.
@@ -51,14 +75,12 @@ This shows a log of changes to be sent in the next commit.
 
 *** New VC command vc-find-conflicted-file.
 
-+++
 *** The 'g' key in VC diff, log, log-incoming and log-outgoing buffers
 reruns the corresponding VC command to compute an up to date version
 of the buffer.
 
 *** vc-dir for Bzr supports viewing shelve contents and shelving snapshots.
 
-+++
 *** Special markup can be added to log-edit buffers.
 You can add headers specifying additional information to be supplied
 to the version control system.  For example:
@@ -71,30 +93,8 @@ Bazaar recognizes the headers "Author", "Date" and "Fixes".
 Git, Mercurial, and Monotone recognize "Author" and "Date".
 Any unknown header is left as is in the message, so it is not lost.
 
-** Rmail
-
-*** The default value of `rmail-enable-mime' is now t.  Rmail decodes
-MIME contents automatically.  You can customize the variable
-`rmail-enable-mime' back to `nil' to disable this automatic MIME
-decoding.
-
-*** The command `rmail-mime' change the displaying of a MIME message
-between decoded presentation form and raw data if `rmail-enable-mime'
-is non-nil.  And, with prefix argument, it change only the displaying
-of the MIME entity at point.
-
-*** The new command `rmail-mime-next-item' (bound to TAB) moves point
-to the next item of MIME message.
-
-*** The new command `rmail-mime-previous-item' (bound to backtab) moves
-point to the previous item of MIME message.
-
-*** The new command `rmail-mime-toggle-hidden' (RET) hide or show the
-body of the MIME entity at point.
-
 ** Obsolete packages
 
-+++
 *** lmenu.el and cl-compat.el are now obsolete.
 
 
@@ -115,26 +115,20 @@ starting from the first line of text below the header line.
 
 * Lisp changes in Emacs 23.3
 
-+++
 ** `e' and `pi' are now called `float-e' and `float-pi'.
   The old names are obsolete.
 
-+++
 ** The use of unintern without an obarray arg is now obsolete.
 
----
 ** The function `princ-list' is now obsolete.
 
-+++
 ** The yank-handler argument to kill-region and friends is now obsolete.
 
-+++
 ** New function byte-to-string, like char-to-string but for bytes.
 
 
 * Changes in Emacs 23.3 on non-free operating systems
 
-+++
 ** The nextstep port can have different modifiers for the left and right
 alt/option key by customizing the value for ns-right-alternate-modifier.
 
diff --git a/etc/themes/tango-theme.el b/etc/themes/tango-theme.el
index 314b3986f21..7be50a17f5f 100644
--- a/etc/themes/tango-theme.el
+++ b/etc/themes/tango-theme.el
@@ -42,20 +42,20 @@ Semantic, and Ansi-Color faces are included.")
       (plum-1 "#ad7fa8") (plum-2 "#75507b") (plum-3 "#5c3566")
       (red-1 "#ef2929")  (red-2 "#cc0000")  (red-3 "#a40000")
       (alum-1 "#eeeeec") (alum-2 "#d3d7cf") (alum-3 "#babdb6")
-      (alum-4 "#888a85") (alum-5 "#555753") (alum-6 "#2e3436")
+      (alum-4 "#888a85") (alum-5 "#5f615c") (alum-6 "#2e3436")
       ;; Not in Tango palette; used for better contrast.
-      (cham-4 "#346604") (blue-0 "#8cc4ff"))
+      (cham-4 "#346604") (blue-0 "#8cc4ff") (orange-4 "#b35000"))
 
   (custom-theme-set-faces
    'tango
-   `(default ((,class (:foreground ,"#16191a" :background ,alum-1))))
+   `(default ((,class (:foreground ,alum-6 :background ,alum-1))))
    `(cursor ((,class (:foreground ,alum-1 :background ,blue-3))))
    ;; Highlighting faces
    `(fringe ((,class (:background ,alum-2))))
    `(highlight ((,class (:background ,alum-3))))
    `(region ((,class (:background ,alum-3))))
    `(secondary-selection ((,class (:background ,blue-0))))
-   `(isearch ((,class (:foreground ,"#ffffff" :background ,orange-3))))
+   `(isearch ((,class (:foreground "#ffffff" :background ,orange-3))))
    `(lazy-highlight ((,class (:background ,choc-1))))
    `(trailing-whitespace ((,class (:background ,red-1))))
    ;; Mode line faces
@@ -67,14 +67,14 @@ Semantic, and Ansi-Color faces are included.")
    `(minibuffer-prompt ((,class (:weight bold :foreground ,blue-3))))
    `(escape-glyph ((,class (:foreground ,red-3))))
    ;; Font lock faces
-   `(font-lock-builtin-face ((,class (:weight bold :foreground ,plum-3))))
-   `(font-lock-comment-face ((,class (:foreground ,cham-4))))
+   `(font-lock-builtin-face ((,class (:foreground ,plum-2))))
+   `(font-lock-comment-face ((,class (:slant italic :foreground ,alum-5))))
    `(font-lock-constant-face ((,class (:weight bold :foreground ,blue-3))))
    `(font-lock-function-name-face ((,class (:foreground ,red-3))))
-   `(font-lock-keyword-face ((,class (:weight bold :foreground ,choc-2))))
+   `(font-lock-keyword-face ((,class (:foreground ,cham-4))))
    `(font-lock-string-face ((,class (:foreground ,plum-3))))
    `(font-lock-type-face ((,class (:foreground ,blue-3))))
-   `(font-lock-variable-name-face ((,class (:weight bold :foreground ,orange-3))))
+   `(font-lock-variable-name-face ((,class (:foreground ,orange-4))))
    `(font-lock-warning-face ((,class (:foreground ,red-2))))
    ;; Button and link faces
    `(button ((,class (:underline t :foreground ,blue-3))))
@@ -85,32 +85,32 @@ Semantic, and Ansi-Color faces are included.")
    `(gnus-group-news-1-low ((,class (:foreground ,plum-3))))
    `(gnus-group-news-2 ((,class (:weight bold :foreground ,blue-3))))
    `(gnus-group-news-2-low ((,class (:foreground ,blue-3))))
-   `(gnus-group-news-3 ((,class (:weight bold :foreground ,"#4e0a06"))))
-   `(gnus-group-news-3-low ((,class (:foreground ,"#4e0a06"))))
+   `(gnus-group-news-3 ((,class (:weight bold :foreground ,red-3))))
+   `(gnus-group-news-3-low ((,class (:foreground ,red-3))))
    `(gnus-group-news-4 ((,class (:weight bold :foreground ,"#7a4c02"))))
    `(gnus-group-news-4-low ((,class (:foreground ,"#7a4c02"))))
    `(gnus-group-news-5 ((,class (:weight bold :foreground ,orange-3))))
    `(gnus-group-news-5-low ((,class (:foreground ,orange-3))))
-   `(gnus-group-news-low ((,class (:foreground ,"#888a85"))))
+   `(gnus-group-news-low ((,class (:foreground ,alum-4))))
    `(gnus-group-mail-1 ((,class (:weight bold :foreground ,plum-3))))
    `(gnus-group-mail-1-low ((,class (:foreground ,plum-3))))
    `(gnus-group-mail-2 ((,class (:weight bold :foreground ,blue-3))))
    `(gnus-group-mail-2-low ((,class (:foreground ,blue-3))))
-   `(gnus-group-mail-3 ((,class (:weight bold :foreground ,"#4e0a06"))))
-   `(gnus-group-mail-3-low ((,class (:foreground ,"#4e0a06"))))
-   `(gnus-group-mail-low ((,class (:foreground ,"#888a85"))))
+   `(gnus-group-mail-3 ((,class (:weight bold :foreground ,cham-3))))
+   `(gnus-group-mail-3-low ((,class (:foreground ,cham-3))))
+   `(gnus-group-mail-low ((,class (:foreground ,alum-4))))
    `(gnus-header-content ((,class (:foreground ,cham-3))))
    `(gnus-header-from ((,class (:weight bold :foreground ,butter-3))))
-   `(gnus-header-subject ((,class (:foreground ,"#4e0a06"))))
+   `(gnus-header-subject ((,class (:foreground ,red-3))))
    `(gnus-header-name ((,class (:foreground ,blue-3))))
-   `(gnus-header-newsgroups ((,class (:foreground ,"#888a85"))))
+   `(gnus-header-newsgroups ((,class (:foreground ,alum-4))))
    ;; Message faces
    `(message-header-name ((,class (:foreground ,blue-3))))
    `(message-header-cc ((,class (:foreground ,butter-3))))
    `(message-header-other ((,class (:foreground ,choc-2))))
-   `(message-header-subject ((,class (:foreground ,"#4e0a06"))))
+   `(message-header-subject ((,class (:foreground ,red-3))))
    `(message-header-to ((,class (:weight bold :foreground ,butter-3))))
-   `(message-cited-text ((,class (:foreground ,"#888a85"))))
+   `(message-cited-text ((,class (:slant italic :foreground ,alum-5))))
    `(message-separator ((,class (:weight bold :foreground ,cham-3))))
    ;; SMerge
    `(smerge-refined-change ((,class (:background ,plum-1))))
diff --git a/etc/themes/wheatgrass-theme.el b/etc/themes/wheatgrass-theme.el
index 0b22fd25d53..7fd241c5057 100644
--- a/etc/themes/wheatgrass-theme.el
+++ b/etc/themes/wheatgrass-theme.el
@@ -20,42 +20,50 @@
 ;;; Code:
 
 (deftheme wheatgrass
-  "Theme for basic, Font Lock, Isearch, Gnus, and Message faces.
-The default face is wheat on a black background.  Other faces
-are in shades of green, brown, and blue.")
+  "A high-contrast theme with a black background.
+Basic, Font Lock, Isearch, Gnus, and Message faces are included.
+The default face foreground is wheat, with other faces in shades
+of green, brown, and blue.")
 
-(custom-theme-set-faces
- 'wheatgrass
- '(default ((t (:foreground "wheat" :background "black"))))
- '(cursor ((t (:foreground "black" :background "thistle"))))
- '(highlight ((t (:foreground "white" :background "dark green"))))
- '(region ((t (:foreground "white" :background "dark green"))))
- '(font-lock-builtin-face ((t (:foreground "LightSteelBlue"))))
- '(font-lock-comment-face ((t (:foreground "SpringGreen3"))))
- '(font-lock-constant-face ((t (:foreground "turquoise"))))
- '(font-lock-function-name-face ((t (:foreground "pale green"))))
- '(font-lock-keyword-face ((t (:foreground "white"))))
- '(font-lock-string-face ((t (:foreground "dark khaki"))))
- '(font-lock-type-face ((t (:foreground "aquamarine"))))
- '(font-lock-variable-name-face ((t (:foreground "yellow green"))))
- '(font-lock-warning-face ((t (:foreground "salmon1"))))
- '(button ((t (:underline t :foreground "cyan"))))
- '(link ((t (:underline t :foreground "cyan"))))
- '(link-visited ((t (:underline t :foreground "dark cyan"))))
- '(isearch ((t (:foreground "white" :background "dark goldenrod"))))
- '(lazy-highlight ((t (:background "gray25"))))
- '(gnus-header-content ((t (:weight normal :foreground "yellow green"))))
- '(gnus-header-from ((t (:foreground "pale green"))))
- '(gnus-header-subject ((t (:foreground "pale turquoise"))))
- '(gnus-header-name ((t (:foreground "dark sea green"))))
- '(gnus-header-newsgroups ((t (:foreground "dark khaki"))))
- '(message-header-name ((t (:foreground "dark turquoise"))))
- '(message-header-cc ((t (:foreground "yellow green"))))
- '(message-header-other ((t (:foreground "dark khaki"))))
- '(message-header-subject ((t (:foreground "pale turquoise"))))
- '(message-header-to ((t (:foreground "pale green"))))
- '(message-cited-text ((t (:foreground "SpringGreen3"))))
- '(message-separator ((t (:foreground "deep sky blue")))))
+(let ((class '((class color) (min-colors 89))))
+  (custom-theme-set-faces
+   'wheatgrass
+   `(default ((,class (:foreground "wheat" :background "black"))))
+   `(cursor ((,class (:foreground "black" :background "thistle"))))
+   ;; Highlighting faces
+   `(highlight ((,class (:foreground "white" :background "dark green"))))
+   `(region ((,class (:foreground "white" :background "dark green"))))
+   `(secondary-selection ((,class (:background "dark slate gray"))))
+   `(isearch ((,class (:foreground "white" :background "dark goldenrod"))))
+   `(lazy-highlight ((,class (:background "gray25"))))
+   ;; Font lock faces
+   `(font-lock-builtin-face ((,class (:foreground "LightSteelBlue"))))
+   `(font-lock-comment-face ((,class (:foreground "SpringGreen3"))))
+   `(font-lock-constant-face ((,class (:foreground "turquoise"))))
+   `(font-lock-function-name-face ((,class (:foreground "pale green"))))
+   `(font-lock-keyword-face ((,class (:foreground "white"))))
+   `(font-lock-string-face ((,class (:foreground "dark khaki"))))
+   `(font-lock-type-face ((,class (:foreground "aquamarine"))))
+   `(font-lock-variable-name-face ((,class (:foreground "yellow green"))))
+   `(font-lock-warning-face ((,class (:foreground "salmon1"))))
+   ;; Button and link faces
+   `(button ((,class (:underline t :foreground "cyan"))))
+   `(link ((,class (:underline t :foreground "cyan"))))
+   `(link-visited ((,class (:underline t :foreground "dark cyan"))))
+   ;; Gnus faces
+   `(gnus-header-content ((,class (:weight normal :foreground "yellow green"))))
+   `(gnus-header-from ((,class (:foreground "pale green"))))
+   `(gnus-header-subject ((,class (:foreground "pale turquoise"))))
+   `(gnus-header-name ((,class (:foreground "dark sea green"))))
+   `(gnus-header-newsgroups ((,class (:foreground "dark khaki"))))
+   ;; Message faces
+   `(message-header-name ((,class (:foreground "dark turquoise"))))
+   `(message-header-cc ((,class (:foreground "yellow green"))))
+   `(message-header-other ((,class (:foreground "dark khaki"))))
+   `(message-header-subject ((,class (:foreground "pale turquoise"))))
+   `(message-header-to ((,class (:foreground "pale green"))))
+   `(message-cited-text ((,class (:foreground "SpringGreen3"))))
+   `(message-separator ((,class (:foreground "deep sky blue"))))))
 
 (provide-theme 'wheatgrass)