Merge from mainline.

47 files changed, 907 insertions, 491 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 512e83999ab..5dc59f3cf1c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,172 @@
+2010-03-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * facemenu.el (list-colors-display, list-colors-print): New arg
+        callback.  Use it to allow selecting colors.
+
+        * wid-edit.el (widget-image-insert): Insert image prop even if the
+        current display is non-graphic.
+        (widget-field-value-set): New fun.
+        (editable-field): Use it.
+        (widget-field-value-get): Clean up unused var.
+        (widget-color-value-create, widget-color--choose-action): New
+        funs.  Allow using list-colors-display to choose color.
+
+2010-03-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cus-edit.el: Resort topmost custom groups.
+        (custom-buffer-sort-alphabetically): Default to t.
+        (customize-apropos): Use apropos-parse-pattern.
+        (custom-search-field): New var.
+        (custom-buffer-create-internal): Add custom-apropos search field.
+        (custom-add-parent-links): Don't display parent doc.
+        (custom-group-value-create): Don't sort top-level custom group.
+        (custom-magic-value-create): Show visibility button before option
+        name.
+
+        (custom-variable-state): New fun, from custom-variable-state-set.
+        (custom-variable-state-set): Use it.
+        (custom-group-value-create): Hide options with standard values
+        using the :hidden-states property.  Use progress reporter.
+
+        (custom-show): Simplify.
+        (custom-visibility): Disable images by default.
+        (custom-variable): New property :hidden-states.
+        (custom-variable-value-create): Enable images for
+        custom-visibility widgets.  Use :hidden-states property to
+        determine initial visibility.
+
+        * wid-edit.el (widget-image-find): Give images center ascent.
+        (visibility): Add :on-image and :off-image properties.
+        (widget-visibility-value-create): Use them.
+
+2010-03-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * cus-edit.el (processes): Remove from development group.
+        (oop, hypermedia): Delete group.
+        (comm): Promote to top-level group.
+
+        * net/browse-url.el (browse-url):
+        * net/xesam.el (xesam):
+        * net/tramp.el (tramp):
+        * net/goto-addr.el (goto-address):
+        * net/ange-ftp.el (ange-ftp): Put in comm group.
+
+        * view.el (view): Remove from editing group.
+
+        * uniquify.el (uniquify): Put in files group.
+
+        * net/browse-url.el (browse-url):
+        * ps-print.el (postscript): Put in external group.
+
+        * cus-edit.el (outlines):
+        * textmodes/text-mode.el (text-mode-hook):
+        * textmodes/table.el (table):
+        * textmodes/picture.el (picture):
+        * outline.el (outlines): Put in wp group.
+
+        * nxml/nxml-mode.el (nxml): Remove from wp group.
+
+        * net/tramp-imap.el (tramp-imap): Put in tramp group.
+
+        * mail/metamail.el (metamail): Remove from hypermedia group.
+
+        * cus-edit.el (abbrev):
+        * whitespace.el (whitespace):
+        * vcursor.el (vcursor):
+        * reveal.el (reveal):
+        * hl-line.el (hl-line): Put in convenience group.
+
+        * epg-config.el (epg): Put in data group.
+
+        * emulation/pc-select.el (pc-select): Put in emulations group.
+
+        * calculator.el (calculator): Put in applications group.
+
+2010-03-12  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Add .dir-locals.el support for file-less buffers.
+        * files.el (hack-local-variables): Split out code to apply local
+        variable settings ...
+        (hack-local-variables-apply): ... here.  New function.
+        (hack-dir-local-variables): Use the default directory for when the
+        buffer does not have an associated file.
+        (hack-dir-local-variables-non-file-buffer): New function.
+        * diff-mode.el (diff-mode):
+        * vc-annotate.el (vc-annotate-mode):
+        * vc-dir.el (vc-dir-mode):
+        * log-edit.el (log-edit-mode):
+        * log-view.el (log-view-mode): Call hack-dir-local-variables-non-file-buffer.
+
+2010-03-12  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        Add support for shelving snapshots and for showing shelves.
+        * vc-bzr.el (vc-bzr-shelve-show, vc-bzr-shelve-show-at-point)
+        (vc-bzr-shelve-apply-and-keep-at-point, vc-bzr-shelve-snapshot):
+        New functions.
+        (vc-bzr-shelve-map, vc-bzr-shelve-menu-map)
+        (vc-bzr-extra-menu-map): Map them.
+
+2010-03-11  Glenn Morris  <rgm@gnu.org>
+
+        * cus-edit.el (customize-changed-options-previous-release):
+        Bump to 23.1.
+
+        * image.el (image-animate-max-time): Fix :version tag.
+
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * Branch for 23.2.
+
+2010-03-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * vc-git.el (vc-git-revision-table): Include remote branches.
+
+2010-03-10  Kim F. Storm  <storm@cua.dk>
+
+        Animated image API.
+        http://lists.gnu.org/archive/html/emacs-devel/2010-03/msg00211.html
+
+        * image.el (image-animate-max-time): New defcustom.
+        (image-animated-types): New defconst.
+        (create-animated-image, image-animate-timer)
+        (image-animate-start, image-animate-stop, image-animate-timeout)
+        (image-animated-p): New functions.
+
+        * image-mode.el (image-toggle-display-image):
+        Replace `create-image' with `create-animated-image'.
+
+2010-03-09  Miles Bader  <Miles Bader <miles@gnu.org>>
+
+        * vc-git.el (vc-git-print-log): Use "tformat:" for shortlog,
+        instead of "format:"; this ensures that the output is
+        newline-terminated.
+
+2010-03-08  Chong Yidong  <cyd@stupidchicken.com>
+
+        * mail/rfc822.el (rfc822-addresses): Use nested catches to ensure
+        that all errors are caught, and that the return value is always a
+        list (Bug#5692).
+
+2010-03-08  Kenichi Handa  <handa@m17n.org>
+
+        * language/misc-lang.el (windows-1256): New coding system.
+        (cp1256): New alias of windows-1256 (bug#5690).
+
+2010-03-07  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * mail/rfc822.el (rfc822-addresses): Move catch clause down around
+        call to rfc822-bad-address.  (Bug#5692)
+
+2010-03-07  Štěpán Němec  <stepnem@gmail.com>  (tiny change)
+
+        * vc-git.el (vc-git-annotate-extract-revision-at-line): Use
+        vc-git-root as default directory for revision path (Bug#5657).
+
+2010-03-06  Chong Yidong  <cyd@stupidchicken.com>
+
+        * calculator.el (calculator): Don't bind split-window-keep-point
+        (Bug#5674).
+
 2010-03-06  Stefan Monnier  <monnier@iro.umontreal.ca>
 
         * vc-git.el: Re-flow to fit into 80 columns.
@@ -61,7 +230,7 @@
 2010-03-01  Alan Mackenzie  <bug-cc-mode@gnu.org>
 
         * cc-engine.el (c-remove-stale-state-cache): Take account of when
-        `good-pos' is in the same macro as `here'.  Fixes bug 5649.
+        `good-pos' is in the same macro as `here'.  Fixes bug#5649.
 
 2010-02-28  Katsumi Yamaoka  <yamaoka@jpl.org>
 
@@ -170,8 +339,8 @@
 
 2010-02-20  Kevin Ryde  <user42@zip.com.au>
 
-        * progmodes/compile.el (compilation-error-regexp-alist-alist): In
-        `watcom' anchor regexp to start of line, to avoid slowness
+        * progmodes/compile.el (compilation-error-regexp-alist-alist):
+        In `watcom' anchor regexp to start of line, to avoid slowness
         (Bug#5599).
 
 2010-02-20  Eli Zaretskii  <eliz@gnu.org>
@@ -236,9 +405,9 @@
 
 2010-02-17  Mark A. Hershberger  <mah@everybody.org>
 
-        * vc-bzr.el: fix typo in Known Bugs section.
+        * vc-bzr.el: Fix typo in Known Bugs section.
 
-        * isearch.el (isearch-update-post-hook): New hook
+        * isearch.el (isearch-update-post-hook): New hook.
         (isearch-update): Use the new hook.
 
 2010-02-16  Michael Albinus  <michael.albinus@gmx.de>
diff --git a/lisp/calculator.el b/lisp/calculator.el
index 015fb4cd763..a20efdbc122 100644
--- a/lisp/calculator.el
+++ b/lisp/calculator.el
@@ -54,7 +54,7 @@
   :prefix "calculator"
   :version "21.1"
   :group 'tools
-  :group 'convenience)
+  :group 'applications)
 
 (defcustom calculator-electric-mode nil
   "Run `calculator' electrically, in the echo area.
@@ -724,8 +724,7 @@ See the documentation for `calculator-mode' for more information."
     (progn
       (cond
         ((not (get-buffer-window calculator-buffer))
-         (let ((split-window-keep-point nil)
-               (window-min-height 2))
+         (let ((window-min-height 2))
            ;; maybe leave two lines for our window because of the normal
            ;; `raised' modeline in Emacs 21
            (select-window
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index b815e31f31c..399a6992f41 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -166,10 +166,27 @@
   "Basic text editing facilities."
   :group 'emacs)
 
+(defgroup convenience nil
+  "Convenience features for faster editing."
+  :group 'emacs)
+
+(defgroup files nil
+  "Support for editing files."
+  :group 'emacs)
+
+(defgroup wp nil
+  "Support for editing text files."
+  :tag "Text"
+  :group 'emacs)
+
+(defgroup data nil
+  "Support for editing binary data files."
+  :group 'emacs)
+
 (defgroup abbrev nil
   "Abbreviation handling, typing shortcuts, macros."
   :tag "Abbreviations"
-  :group 'editing)
+  :group 'convenience)
 
 (defgroup matching nil
   "Various sorts of searching and matching."
@@ -186,20 +203,20 @@
 
 (defgroup outlines nil
   "Support for hierarchical outlining."
-  :group 'editing)
+  :group 'wp)
 
 (defgroup external nil
   "Interfacing to external utilities."
   :group 'emacs)
 
+(defgroup comm nil
+  "Communications, networking, and remote access to files."
+  :tag "Communication"
+  :group 'emacs)
+
 (defgroup processes nil
   "Process, subshell, compilation, and job control support."
-  :group 'external
-  :group 'development)
-
-(defgroup convenience nil
-  "Convenience features for faster editing."
-  :group 'emacs)
+  :group 'external)
 
 (defgroup programming nil
   "Support for programming in other languages."
@@ -225,10 +242,6 @@
   "Programming tools."
   :group 'programming)
 
-(defgroup oop nil
-  "Support for object-oriented programming."
-  :group 'programming)
-
 (defgroup applications nil
   "Applications written in Emacs."
   :group 'emacs)
@@ -275,11 +288,6 @@
   "Fitting Emacs with its environment."
   :group 'emacs)
 
-(defgroup comm nil
-  "Communications, networking, remote access to files."
-  :tag "Communication"
-  :group 'environment)
-
 (defgroup hardware nil
   "Support for interfacing with miscellaneous hardware."
   :group 'environment)
@@ -306,18 +314,6 @@
   "Support for Emacs frames and window systems."
   :group 'environment)
 
-(defgroup data nil
-  "Support for editing files of data."
-  :group 'emacs)
-
-(defgroup files nil
-  "Support for editing files."
-  :group 'emacs)
-
-(defgroup wp nil
-  "Word processing."
-  :group 'emacs)
-
 (defgroup tex nil
   "Code related to the TeX formatter."
   :link '(custom-group-link :tag "Font Lock Faces group" font-lock-faces)
@@ -327,10 +323,6 @@
   "Support for multiple fonts."
   :group 'emacs)
 
-(defgroup hypermedia nil
-  "Support for links between text or other media types."
-  :group 'emacs)
-
 (defgroup help nil
   "Support for on-line help systems."
   :group 'emacs)
@@ -680,8 +672,8 @@ If `last', order groups after non-groups."
   :group 'custom-browse)
 
 ;;;###autoload
-(defcustom custom-buffer-sort-alphabetically nil
-  "If non-nil, sort each customization group alphabetically in Custom buffer."
+(defcustom custom-buffer-sort-alphabetically t
+  "Whether to sort customization groups alphabetically in Custom buffer."
   :type 'boolean
   :group 'custom-buffer)
 
@@ -1136,7 +1128,7 @@ Show the buffer in another window, but don't select it."
     (unless (eq symbol basevar)
       (message "`%s' is an alias for `%s'" symbol basevar))))
 
-(defvar customize-changed-options-previous-release "22.1"
+(defvar customize-changed-options-previous-release "23.1"
   "Version for `customize-changed-options' to refer back to by default.")
 
 ;; Packages will update this variable, so make it available.
@@ -1382,42 +1374,52 @@ suggest to customize that face, if it's customizable."
       (custom-buffer-create (custom-sort-items found t nil)
                             "*Customize Saved*"))))
 
+(declare-function apropos-parse-pattern "apropos" (pattern))
+
 ;;;###autoload
-(defun customize-apropos (regexp &optional all)
-  "Customize all loaded options, faces and groups matching REGEXP.
-If ALL is `options', include only options.
-If ALL is `faces', include only faces.
-If ALL is `groups', include only groups.
-If ALL is t (interactively, with prefix arg), include variables
+(defun customize-apropos (pattern &optional type)
+  "Customize all loaded options, faces and groups matching PATTERN.
+PATTERN can be a word, a list of words (separated by spaces),
+or a regexp (using some regexp special characters).  If it is a word,
+search for matches for that word as a substring.  If it is a list of words,
+search for matches for any two (or more) of those words.
+
+If TYPE is `options', include only options.
+If TYPE is `faces', include only faces.
+If TYPE is `groups', include only groups.
+If TYPE is t (interactively, with prefix arg), include variables
 that are not customizable options, as well as faces and groups
 \(but we recommend using `apropos-variable' instead)."
-  (interactive "sCustomize (regexp): \nP")
-  (let ((found nil))
-    (mapatoms (lambda (symbol)
-                (when (string-match regexp (symbol-name symbol))
-                  (when (and (not (memq all '(faces options)))
-                             (get symbol 'custom-group))
-                    (push (list symbol 'custom-group) found))
-                  (when (and (not (memq all '(options groups)))
-                             (custom-facep symbol))
-                    (push (list symbol 'custom-face) found))
-                  (when (and (not (memq all '(groups faces)))
-                             (boundp symbol)
-                             (eq (indirect-variable symbol) symbol)
-                             (or (get symbol 'saved-value)
-                                 (custom-variable-p symbol)
-                                 (and (not (memq all '(nil options)))
-                                      (get symbol 'variable-documentation))))
-                    (push (list symbol 'custom-variable) found)))))
+  (interactive (list (apropos-read-pattern "symbol") current-prefix-arg))
+  (require 'apropos)
+  (apropos-parse-pattern pattern)
+  (let (found tests)
+    (mapatoms
+     `(lambda (symbol)
+        (when (string-match apropos-regexp (symbol-name symbol))
+          ,(if (not (memq type '(faces options)))
+               '(if (get symbol 'custom-group)
+                    (push (list symbol 'custom-group) found)))
+          ,(if (not (memq type '(options groups)))
+               '(if (custom-facep symbol)
+                    (push (list symbol 'custom-face) found)))
+          ,(if (not (memq type '(groups faces)))
+               `(if (and (boundp symbol)
+                         (eq (indirect-variable symbol) symbol)
+                         (or (get symbol 'saved-value)
+                             (custom-variable-p symbol)
+                             ,(if (not (memq type '(nil options)))
+                                  '(get symbol 'variable-documentation))))
+                    (push (list symbol 'custom-variable) found))))))
     (if (not found)
         (error "No %s matching %s"
-               (if (eq all t)
-                   "items"
-                 (format "customizable %s"
-                         (if (memq all '(options faces groups))
-                             (symbol-name all)
-                           "items")))
-               regexp)
+               (if (eq type t)
+                   "items"
+                 (format "customizable %s"
+                         (if (memq type '(options faces groups))
+                             (symbol-name type)
+                           "items")))
+               pattern)
       (custom-buffer-create
        (custom-sort-items found t custom-buffer-order-groups)
        "*Customize Apropos*"))))
@@ -1540,6 +1542,12 @@ This button will have a menu with all three reset operations."
 (defvar custom-button-pressed nil
   "Face used for pressed buttons in customization buffers.")
 
+(defcustom custom-search-field t
+  "If non-nil, show a search field in Custom buffers."
+  :type 'boolean
+  :version "24.1"
+  :group 'custom-buffer)
+
 (defcustom custom-raised-buttons (not (equal (face-valid-attribute-values :box)
                                              '(("unspecified" . unspecified))))
   "If non-nil, indicate active buttons in a `raised-button' style.
@@ -1563,14 +1571,9 @@ Otherwise use brackets."
   (let ((init-file (or custom-file user-init-file)))
     ;; Insert verbose help at the top of the custom buffer.
     (when custom-buffer-verbose-help
-      (widget-insert "Editing a setting changes only the text in this buffer."
-                     (if init-file
-                         "
-To apply your changes, use the Save or Set buttons.
-Saving a change normally works by editing your init file."
-                       "
-Currently, these settings cannot be saved for future Emacs sessions,
-possibly because you started Emacs with `-q'.")
+      (widget-insert (if init-file
+                         "To apply changes, use the Save or Set buttons."
+                       "Custom settings cannot be saved; maybe you started Emacs with `-q'.")
                      "\nFor details, see ")
       (widget-create 'custom-manual
                      :tag "Saving Customizations"
@@ -1582,6 +1585,26 @@ possibly because you started Emacs with `-q'.")
                      "(emacs)Top")
       (widget-insert "."))
     (widget-insert "\n")
+
+    ;; Insert the search field.
+    (when custom-search-field
+      (widget-insert "\n")
+      (let* ((echo "Search for custom items")
+             (search-widget
+              (widget-create
+               'editable-field
+               :size 40 :help-echo echo
+               :action `(lambda (widget &optional event)
+                          (customize-apropos (widget-value widget))))))
+        (widget-insert " ")
+        (widget-create-child-and-convert
+         search-widget 'push-button
+         :tag "Search"
+         :help-echo echo :action
+         (lambda (widget &optional event)
+           (customize-apropos (widget-value (widget-get widget :parent)))))
+        (widget-insert "\n")))
+
     ;; The custom command buttons are also in the toolbar, so for a
     ;; time they were not inserted in the buffer if the toolbar was in use.
     ;; But it can be a little confusing for the buffer layout to
@@ -1589,10 +1612,9 @@ possibly because you started Emacs with `-q'.")
     ;; mention that a custom buffer can in theory be created in a
     ;; frame with a toolbar, then later viewed in one without.
     ;; So now the buttons are always inserted in the buffer.  (Bug#1326)
-;;;    (when (not (and (bound-and-true-p tool-bar-mode) (display-graphic-p)))
     (if custom-buffer-verbose-help
-        (widget-insert "\n
- Operate on all settings in this buffer that are not marked HIDDEN:\n"))
+        (widget-insert "
+ Operate on all settings in this buffer:\n"))
     (let ((button (lambda (tag action active help icon)
                     (widget-insert " ")
                     (if (eval active)
@@ -1988,63 +2010,64 @@ and `face'."
                    (nth 3 entry)))
          (form (widget-get parent :custom-form))
          children)
-    (while (string-match "\\`\\(.*\\)%c\\(.*\\)\\'" text)
-      (setq text (concat (match-string 1 text)
-                         (symbol-name category)
-                         (match-string 2 text))))
-    (when (and custom-magic-show
-               (or (not hidden)
-                   (memq category custom-magic-show-hidden)))
-      (insert "   ")
+    (unless (eq state 'hidden)
+      (while (string-match "\\`\\(.*\\)%c\\(.*\\)\\'" text)
+        (setq text (concat (match-string 1 text)
+                           (symbol-name category)
+                           (match-string 2 text))))
+      (when (and custom-magic-show
+                 (or (not hidden)
+                     (memq category custom-magic-show-hidden)))
+        (insert "   ")
+        (when (and (eq category 'group)
+                   (not (and (eq custom-buffer-style 'links)
+                             (> (widget-get parent :custom-level) 1))))
+          (insert-char ?\  (* custom-buffer-indent
+                              (widget-get parent :custom-level))))
+        (push (widget-create-child-and-convert
+               widget 'choice-item
+               :help-echo "Change the state of this item."
+               :format (if hidden "%t" "%[%t%]")
+               :button-prefix 'widget-push-button-prefix
+               :button-suffix 'widget-push-button-suffix
+               :mouse-down-action 'widget-magic-mouse-down-action
+               :tag "State")
+              children)
+        (insert ": ")
+        (let ((start (point)))
+          (if (eq custom-magic-show 'long)
+              (insert text)
+            (insert (symbol-name state)))
+          (cond ((eq form 'lisp)
+                 (insert " (lisp)"))
+                ((eq form 'mismatch)
+                 (insert " (mismatch)")))
+          (put-text-property start (point) 'face 'custom-state))
+        (insert "\n"))
       (when (and (eq category 'group)
                  (not (and (eq custom-buffer-style 'links)
                            (> (widget-get parent :custom-level) 1))))
         (insert-char ?\  (* custom-buffer-indent
                             (widget-get parent :custom-level))))
-      (push (widget-create-child-and-convert
-             widget 'choice-item
-             :help-echo "Change the state of this item."
-             :format (if hidden "%t" "%[%t%]")
-             :button-prefix 'widget-push-button-prefix
-             :button-suffix 'widget-push-button-suffix
-             :mouse-down-action 'widget-magic-mouse-down-action
-             :tag "State")
-            children)
-      (insert ": ")
-      (let ((start (point)))
-        (if (eq custom-magic-show 'long)
-            (insert text)
-          (insert (symbol-name state)))
-        (cond ((eq form 'lisp)
-               (insert " (lisp)"))
-              ((eq form 'mismatch)
-               (insert " (mismatch)")))
-        (put-text-property start (point) 'face 'custom-state))
-      (insert "\n"))
-    (when (and (eq category 'group)
-               (not (and (eq custom-buffer-style 'links)
-                         (> (widget-get parent :custom-level) 1))))
-      (insert-char ?\  (* custom-buffer-indent
-                          (widget-get parent :custom-level))))
-    (when custom-magic-show-button
-      (when custom-magic-show
-        (let ((indent (widget-get parent :indent)))
-          (when indent
-            (insert-char ?  indent))))
-      (push (widget-create-child-and-convert
-             widget 'choice-item
-             :mouse-down-action 'widget-magic-mouse-down-action
-             :button-face face
-             :button-prefix ""
-             :button-suffix ""
-             :help-echo "Change the state."
-             :format (if hidden "%t" "%[%t%]")
-             :tag (if (memq form '(lisp mismatch))
-                      (concat "(" magic ")")
-                    (concat "[" magic "]")))
-            children)
-      (insert " "))
-    (widget-put widget :children children)))
+      (when custom-magic-show-button
+        (when custom-magic-show
+          (let ((indent (widget-get parent :indent)))
+            (when indent
+              (insert-char ?  indent))))
+        (push (widget-create-child-and-convert
+               widget 'choice-item
+               :mouse-down-action 'widget-magic-mouse-down-action
+               :button-face face
+               :button-prefix ""
+               :button-suffix ""
+               :help-echo "Change the state."
+               :format (if hidden "%t" "%[%t%]")
+               :tag (if (memq form '(lisp mismatch))
+                        (concat "(" magic ")")
+                      (concat "[" magic "]")))
+              children)
+        (insert " "))
+      (widget-put widget :children children))))
 
 (defun custom-magic-reset (widget)
   "Redraw the :custom-magic property of WIDGET."
@@ -2206,12 +2229,9 @@ and `face'."
 (defun custom-show (widget value)
   "Non-nil if WIDGET should be shown with VALUE by default."
   (let ((show (widget-get widget :custom-show)))
-    (cond ((null show)
-           nil)
-          ((eq t show)
-           t)
-          (t
-           (funcall show widget value)))))
+    (if (functionp show)
+        (funcall show widget value)
+      show)))
 
 (defun custom-load-widget (widget)
   "Load all dependencies for WIDGET."
@@ -2289,8 +2309,7 @@ Insert PREFIX first if non-nil."
                (insert ", "))))
       (widget-put widget :buttons buttons))))
 
-(defun custom-add-parent-links (widget &optional initial-string
-                                       doc-initial-string)
+(defun custom-add-parent-links (widget &optional initial-string doc-initial-string)
   "Add \"Parent groups: ...\" to WIDGET if the group has parents.
 The value is non-nil if any parents were found.
 If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
@@ -2309,36 +2328,6 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
                          symbol)
                         buttons)
                   (setq parents (cons symbol parents)))))
-    (and (null (get name 'custom-links)) ;No links of its own.
-         (= (length parents) 1)         ;A single parent.
-         (let* ((links (delq nil (mapcar (lambda (w)
-                                           (unless (eq (widget-type w)
-                                                       'custom-group-link)
-                                             w))
-                                         (get (car parents) 'custom-links))))
-                (many (> (length links) 2)))
-           (when links
-             (let ((pt (point))
-                   (left-margin (+ left-margin 2)))
-               (insert "\n" (or doc-initial-string "Group documentation:") " ")
-               (while links
-                 (push (widget-create-child-and-convert
-                        widget (car links)
-                        :button-face 'custom-link
-                        :mouse-face 'highlight
-                        :pressed-face 'highlight)
-                       buttons)
-                 (setq links (cdr links))
-                 (cond ((null links)
-                        (insert ".\n"))
-                       ((null (cdr links))
-                        (if many
-                            (insert ", and ")
-                          (insert " and ")))
-                       (t
-                        (insert ", "))))
-               (fill-region-as-paragraph pt (point))
-               (delete-to-left-margin (1+ pt) (+ pt 2))))))
     (if parents
         (insert "\n")
       (delete-region start (point)))
@@ -2413,8 +2402,6 @@ If INITIAL-STRING is non-nil, use that rather than \"Parent groups:\"."
 
 ;;; The `custom-variable' Widget.
 
-;; When this was underlined blue, users confused it with a
-;; Mosaic-style hyperlink...
 (defface custom-variable-tag
   `((((class color)
       (background dark))
@@ -2459,7 +2446,11 @@ However, setting it through Custom sets the default value.")
     (documentation-property variable 'variable-documentation)))
 
 (define-widget 'custom-variable 'custom
-  "Customize variable."
+  "A widget for displaying a Custom variable.
+
+The following property has a special meaning for this widget:
+:hidden-states - A list of widget states for which the widget's initial
+                 contents should be hidden."
   :format "%v"
   :help-echo "Set or reset this variable."
   :documentation-property #'custom-variable-documentation
@@ -2469,6 +2460,7 @@ However, setting it through Custom sets the default value.")
   :custom-form nil ; defaults to value of `custom-variable-default-form'
   :value-create 'custom-variable-value-create
   :action 'custom-variable-action
+  :hidden-states '(standard)
   :custom-set 'custom-variable-set
   :custom-mark-to-save 'custom-variable-mark-to-save
   :custom-reset-current 'custom-redraw
@@ -2503,7 +2495,6 @@ try matching its doc string against `custom-guess-doc-alist'."
   (let* ((buttons (widget-get widget :buttons))
          (children (widget-get widget :children))
          (form (widget-get widget :custom-form))
-         (state (widget-get widget :custom-state))
          (symbol (widget-get widget :value))
          (tag (widget-get widget :tag))
          (type (custom-variable-type symbol))
@@ -2513,17 +2504,17 @@ try matching its doc string against `custom-guess-doc-alist'."
          (last (widget-get widget :custom-last))
          (value (if (default-boundp symbol)
                     (funcall get symbol)
-                  (widget-get conv :value))))
-    ;; If the widget is new, the child determines whether it is hidden.
-    (cond (state)
-          ((custom-show type value)
-           (setq state 'unknown))
-          (t
-           (setq state 'hidden)))
+                  (widget-get conv :value)))
+         (state (or (widget-get widget :custom-state)
+                    (if (memq (custom-variable-state symbol value)
+                              (widget-get widget :hidden-states))
+                        'hidden))))
+
     ;; If we don't know the state, see if we need to edit it in lisp form.
+    (unless state
+      (setq state (if (custom-show type value) 'unknown 'hidden)))
     (when (eq state 'unknown)
       (unless (widget-apply conv :match value)
-        ;; (widget-apply (widget-convert type) :match value)
         (setq form 'mismatch)))
     ;; Now we can create the child widget.
     (cond ((eq custom-buffer-style 'tree)
@@ -2536,21 +2527,36 @@ try matching its doc string against `custom-guess-doc-alist'."
           ((eq state 'hidden)
            ;; Indicate hidden value.
            (push (widget-create-child-and-convert
-                  widget 'item
-                  :format "%{%t%}: "
-                  :sample-face 'custom-variable-tag
-                  :tag tag
-                  :parent widget)
-                 buttons)
-           (push (widget-create-child-and-convert
-                  widget 'visibility
+                  widget 'custom-visibility
                   :help-echo "Show the value of this option."
+                  :on-image "down"
+                  :on "Hide"
+                  :off-image "right"
                   :off "Show Value"
                   :action 'custom-toggle-parent
                   nil)
+                 buttons)
+           (insert " ")
+           (push (widget-create-child-and-convert
+                  widget 'item
+                  :format "%{%t%} "
+                  :sample-face 'custom-variable-tag
+                  :tag tag
+                  :parent widget)
                  buttons))
           ((memq form '(lisp mismatch))
            ;; In lisp mode edit the saved value when possible.
+           (push (widget-create-child-and-convert
+                  widget 'custom-visibility
+                  :help-echo "Hide the value of this option."
+                  :on "Hide"
+                  :off "Show"
+                  :on-image "down"
+                  :off-image "right"
+                  :action 'custom-toggle-parent
+                  t)
+                 buttons)
+           (insert " ")
            (let* ((value (cond ((get symbol 'saved-value)
                                 (car (get symbol 'saved-value)))
                                ((get symbol 'standard-value)
@@ -2561,15 +2567,6 @@ try matching its doc string against `custom-guess-doc-alist'."
                                 (custom-quote (widget-get conv :value))))))
              (insert (symbol-name symbol) ": ")
              (push (widget-create-child-and-convert
-                    widget 'visibility
-                    :help-echo "Hide the value of this option."
-                    :on "Hide Value"
-                    :off "Show Value"
-                    :action 'custom-toggle-parent
-                    t)
-                   buttons)
-             (insert " ")
-             (push (widget-create-child-and-convert
                     widget 'sexp
                     :button-face 'custom-variable-button-face
                     :format "%v"
@@ -2579,6 +2576,17 @@ try matching its doc string against `custom-guess-doc-alist'."
                    children)))
           (t
            ;; Edit mode.
+           (push (widget-create-child-and-convert
+                  widget 'custom-visibility
+                  :help-echo "Hide or show this option."
+                  :on "Hide"
+                  :off "Show"
+                  :on-image "down"
+                  :off-image "right"
+                  :action 'custom-toggle-parent
+                  t)
+                 buttons)
+           (insert " ")
            (let* ((format (widget-get type :format))
                   tag-format value-format)
              (unless (string-match ":" format)
@@ -2595,15 +2603,6 @@ try matching its doc string against `custom-guess-doc-alist'."
                     :sample-face 'custom-variable-tag
                     tag)
                    buttons)
-             (insert " ")
-             (push (widget-create-child-and-convert
-                    widget 'visibility
-                    :help-echo "Hide the value of this option."
-                    :on "Hide Value"
-                    :off "Show Value"
-                    :action 'custom-toggle-parent
-                    t)
-                   buttons)
              (push (widget-create-child-and-convert
                     widget type
                     :format value-format
@@ -2635,7 +2634,7 @@ try matching its doc string against `custom-guess-doc-alist'."
           ;; Don't push it !!! Custom assumes that the first child is the
           ;; value one.
           (setq children (append children (list comment-widget)))))
-      ;; Update the rest of the properties properties.
+      ;; Update the rest of the properties.
       (widget-put widget :custom-form form)
       (widget-put widget :children children)
       ;; Now update the state.
@@ -2658,61 +2657,69 @@ try matching its doc string against `custom-guess-doc-alist'."
   (apply 'widget-apply (car (widget-get (widget-get widget :parent) :children))
          :mouse-down-action args))
 
-(defun custom-variable-state-set (widget)
-  "Set the state of WIDGET."
-  (let* ((symbol (widget-value widget))
-         (get (or (get symbol 'custom-get) 'default-value))
+(defun custom-variable-state (symbol val)
+  "Return the state of SYMBOL if its value is VAL.
+If SYMBOL has a non-nil `custom-get' property, it overrides VAL.
+Possible return values are `standard', `saved', `set', `themed',
+`changed', and `rogue'."
+  (let* ((get (or (get symbol 'custom-get) 'default-value))
          (value (if (default-boundp symbol)
                     (funcall get symbol)
-                  (widget-get widget :value)))
+                  val))
          (comment (get symbol 'variable-comment))
          tmp
-         temp
-         (state (cond ((progn (setq tmp (get symbol 'customized-value))
-                              (setq temp
-                                    (get symbol 'customized-variable-comment))
-                              (or tmp temp))
-                       (if (condition-case nil
-                               (and (equal value (eval (car tmp)))
-                                    (equal comment temp))
-                             (error nil))
-                           'set
-                         'changed))
-                      ((progn (setq tmp (get symbol 'theme-value))
-                              (setq temp (get symbol 'saved-variable-comment))
-                              (or tmp temp))
-                       (if (condition-case nil
-                               (and (equal comment temp)
-                                    (equal value
-                                           (eval
-                                            (car (custom-variable-theme-value
-                                                  symbol)))))
-                             (error nil))
-                           (cond
-                            ((eq (caar tmp) 'user) 'saved)
-                            ((eq (caar tmp) 'changed)
-                             (if (condition-case nil
-                                     (and (null comment)
-                                          (equal value
-                                                 (eval
-                                                  (car (get symbol 'standard-value)))))
-                                   (error nil))
-                                 ;; The value was originally set outside
-                                 ;; custom, but it was set to the standard
-                                 ;; value (probably an autoloaded defcustom).
-                                 'standard
-                               'changed))
-                            (t 'themed))
-                         'changed))
-                      ((setq tmp (get symbol 'standard-value))
-                       (if (condition-case nil
-                               (and (equal value (eval (car tmp)))
-                                    (equal comment nil))
-                             (error nil))
-                           'standard
-                         'changed))
-                      (t 'rogue))))
-    (widget-put widget :custom-state state)))
+         temp)
+    (cond ((progn (setq tmp (get symbol 'customized-value))
+                  (setq temp
+                        (get symbol 'customized-variable-comment))
+                  (or tmp temp))
+           (if (condition-case nil
+                   (and (equal value (eval (car tmp)))
+                        (equal comment temp))
+                 (error nil))
+               'set
+             'changed))
+          ((progn (setq tmp (get symbol 'theme-value))
+                  (setq temp (get symbol 'saved-variable-comment))
+                  (or tmp temp))
+           (if (condition-case nil
+                   (and (equal comment temp)
+                        (equal value
+                               (eval
+                                (car (custom-variable-theme-value
+                                      symbol)))))
+                 (error nil))
+               (cond
+                ((eq (caar tmp) 'user) 'saved)
+                ((eq (caar tmp) 'changed)
+                 (if (condition-case nil
+                         (and (null comment)
+                              (equal value
+                                     (eval
+                                      (car (get symbol 'standard-value)))))
+                       (error nil))
+                     ;; The value was originally set outside
+                     ;; custom, but it was set to the standard
+                     ;; value (probably an autoloaded defcustom).
+                     'standard
+                   'changed))
+                (t 'themed))
+             'changed))
+          ((setq tmp (get symbol 'standard-value))
+           (if (condition-case nil
+                   (and (equal value (eval (car tmp)))
+                        (equal comment nil))
+                 (error nil))
+               'standard
+             'changed))
+          (t 'rogue))))
+
+(defun custom-variable-state-set (widget &optional state)
+  "Set the state of WIDGET to STATE.
+If STATE is nil, the value is computed by `custom-variable-state'."
+  (widget-put widget :custom-state
+              (or state (custom-variable-state (widget-value widget)
+                                               (widget-get widget :value)))))
 
 (defun custom-variable-standard-value (widget)
   (get (widget-value widget) 'standard-value))
@@ -2998,7 +3005,9 @@ to switch between two values."
   :button-face 'custom-visibility
   :pressed-face 'custom-visibility
   :mouse-face 'highlight
-  :pressed-face 'highlight)
+  :pressed-face 'highlight
+  :on-image nil
+  :off-image nil)
 
 (defface custom-visibility
   '((t :height 0.8 :inherit link))
@@ -3345,6 +3354,18 @@ SPEC must be a full face spec."
            (insert " " tag "\n")
            (widget-put widget :buttons buttons))
           (t
+           ;; Visibility.
+           (push (widget-create-child-and-convert
+                  widget 'custom-visibility
+                  :help-echo "Hide or show this face."
+                  :on "Hide"
+                  :off "Show"
+                  :on-image "down"
+                  :off-image "right"
+                  :action 'custom-toggle-parent
+                  (not (eq state 'hidden)))
+                 buttons)
+           (insert " ")
            ;; Create tag.
            (insert tag)
            (widget-specify-sample widget begin (point))
@@ -3359,16 +3380,6 @@ SPEC must be a full face spec."
                                                   :sample-face symbol
                                                   :tag "sample")
                  buttons)
-           ;; Visibility.
-           (insert " ")
-           (push (widget-create-child-and-convert
-                  widget 'visibility
-                  :help-echo "Hide or show this face."
-                  :on "Hide Face"
-                  :off "Show Face"
-                  :action 'custom-toggle-parent
-                  (not (eq state 'hidden)))
-                 buttons)
            ;; Magic.
            (insert "\n")
            (let ((magic (widget-create-child-and-convert
@@ -3920,8 +3931,11 @@ If GROUPS-ONLY non-nil, return only those members that are groups."
              (insert " " tag "\n")
              (widget-put widget :buttons buttons)
              (message "Creating group...")
-             (let* ((members (custom-sort-items members
-                              custom-browse-sort-alphabetically
+             (let* ((members (custom-sort-items
+                              members
+                              ;; Never sort the top-level custom group.
+                              (unless (eq symbol 'emacs)
+                                custom-browse-sort-alphabetically)
                               custom-browse-order-groups))
                     (prefixes (widget-get widget :custom-prefixes))
                     (custom-prefix-list (custom-prefix-add symbol prefixes))
@@ -3979,17 +3993,21 @@ If GROUPS-ONLY non-nil, return only those members that are groups."
 
           ;; Nested style.
           (t                            ;Visible.
+           ;; Draw a horizontal line (this works for both graphical
+           ;; and text displays):
+           (let ((p (point)))
+             (insert "\n")
+             (put-text-property p (1+ p) 'face '(:underline t))
+             (overlay-put (make-overlay p (1+ p))
+                          'before-string
+                          (propertize "\n" 'face '(:underline t)
+                                      'display '(space :align-to 999))))
+
            ;; Add parent groups references above the group.
-           (if t    ;;; This should test that the buffer
-                    ;;; was made to display a group.
-               (when (eq level 1)
-                 (if (custom-add-parent-links widget
-                                              "Parent groups:"
-                                              "Parent group documentation:")
-                     (insert "\n"))))
-           ;; Create level indicator.
+           (when (eq level 1)
+             (if (custom-add-parent-links widget "Parent groups:")
+                 (insert "\n")))
            (insert-char ?\  (* custom-buffer-indent (1- level)))
-           (insert "/- ")
            ;; Create tag.
            (let ((start (point)))
              (insert tag " group: ")
@@ -4009,12 +4027,7 @@ If GROUPS-ONLY non-nil, return only those members that are groups."
                     (not (eq state 'hidden)))
                    buttons)
              (insert " "))
-           ;; Create more dashes.
-           ;; Use 76 instead of 75 to compensate for the temporary "<"
-           ;; added by `widget-insert'.
-           (insert-char ?- (- 76 (current-column)
-                              (* custom-buffer-indent level)))
-           (insert "\\\n")
+           (insert "\n")
            ;; Create magic button.
            (let ((magic (widget-create-child-and-convert
                          widget 'custom-magic
@@ -4040,43 +4053,50 @@ If GROUPS-ONLY non-nil, return only those members that are groups."
                                              ?\ ))
            ;; Members.
            (message "Creating group...")
-           (let* ((members (custom-sort-items members
-                                              custom-buffer-sort-alphabetically
-                                              custom-buffer-order-groups))
+           (let* ((members (custom-sort-items
+                            members
+                            ;; Never sort the top-level custom group.
+                            (unless (eq symbol 'emacs)
+                              custom-buffer-sort-alphabetically)
+                            custom-buffer-order-groups))
                   (prefixes (widget-get widget :custom-prefixes))
                   (custom-prefix-list (custom-prefix-add symbol prefixes))
-                  (length (length members))
+                  (len (length members))
                   (count 0)
-                  (children (mapcar (lambda (entry)
-                                      (widget-insert "\n")
-                                      (message "\
-Creating group members... %2d%%"
-                                               (/ (* 100.0 count) length))
-                                      (setq count (1+ count))
-                                      (prog1
-                                          (widget-create-child-and-convert
-                                           widget (nth 1 entry)
-                                           :group widget
-                                           :tag (custom-unlispify-tag-name
-                                                 (nth 0 entry))
-                                           :custom-prefixes custom-prefix-list
-                                           :custom-level (1+ level)
-                                           :value (nth 0 entry))
-                                        (unless (eq (preceding-char) ?\n)
-                                          (widget-insert "\n"))))
-                                    members)))
-             (message "Creating group magic...")
+                  (reporter (make-progress-reporter
+                             "Creating group entries..." 0 len))
+                  children)
+             (setq children
+                   (mapcar
+                    (lambda (entry)
+                      (widget-insert "\n")
+                      (progress-reporter-update reporter (setq count (1+ count)))
+                      (let ((sym (nth 0 entry))
+                            (type (nth 1 entry))
+                            hidden-p)
+                        (prog1
+                            (widget-create-child-and-convert
+                             widget type
+                             :group widget
+                             :tag (custom-unlispify-tag-name sym)
+                             :custom-prefixes custom-prefix-list
+                             :custom-level (1+ level)
+                             :value sym)
+                          (unless (eq (preceding-char) ?\n)
+                            (widget-insert "\n")))))
+                    members))
              (mapc 'custom-magic-reset children)
-             (message "Creating group state...")
              (widget-put widget :children children)
              (custom-group-state-update widget)
-             (message "Creating group... done"))
+             (progress-reporter-done reporter))
            ;; End line
-           (insert "\n")
-           (insert-char ?\  (* custom-buffer-indent (1- level)))
-           (insert "\\- " (widget-get widget :tag) " group end ")
-           (insert-char ?- (- 75 (current-column) (* custom-buffer-indent level)))
-           (insert "/\n")))))
+           (let ((p (point)))
+             (insert "\n")
+             (put-text-property p (1+ p) 'face '(:underline t))
+             (overlay-put (make-overlay p (1+ p))
+                          'before-string
+                          (propertize "\n" 'face '(:underline t)
+                                      'display '(space :align-to 999))))))))
 
 (defvar custom-group-menu
   `(("Set for Current Session" custom-group-set
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 27f8318f91c..75ea98ba911 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -1287,7 +1287,9 @@ a diff with \\[diff-reverse-direction].
   (set (make-local-variable 'add-log-current-defun-function)
        'diff-current-defun)
   (set (make-local-variable 'add-log-buffer-file-name-function)
-       (lambda () (diff-find-file-name nil 'noprompt))))
+       (lambda () (diff-find-file-name nil 'noprompt)))
+  (unless (buffer-file-name)
+    (hack-dir-local-variables-non-file-buffer)))
 
 ;;;###autoload
 (define-minor-mode diff-minor-mode
diff --git a/lisp/emulation/pc-select.el b/lisp/emulation/pc-select.el
index 45c3840bdd2..175999b6e37 100644
--- a/lisp/emulation/pc-select.el
+++ b/lisp/emulation/pc-select.el
@@ -82,8 +82,7 @@
 (defgroup pc-select nil
   "Emulate pc bindings."
   :prefix "pc-select"
-  :group 'editing-basics
-  :group 'convenience)
+  :group 'emulations)
 
 (defcustom pc-select-override-scroll-error t
   "*Non-nil means don't generate error on scrolling past edge of buffer.
diff --git a/lisp/epg-config.el b/lisp/epg-config.el
index 3cdf2ff3ffa..ddbdd3541ad 100644
--- a/lisp/epg-config.el
+++ b/lisp/epg-config.el
@@ -34,7 +34,7 @@
 (defgroup epg ()
   "The EasyPG library."
   :version "23.1"
-  :group 'emacs)
+  :group 'data)
 
 (defcustom epg-gpg-program "gpg"
   "The `gpg' executable."
diff --git a/lisp/erc/ChangeLog b/lisp/erc/ChangeLog
index c192b3400b4..18fc5f188a9 100644
--- a/lisp/erc/ChangeLog
+++ b/lisp/erc/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * Branch for 23.2.
+
 2010-02-07  Vivek Dasmohapatra  <vivek@etla.org>
 
         * erc-services.el (erc-nickserv-alist): Fix defcustom type (Bug#5520).
diff --git a/lisp/facemenu.el b/lisp/facemenu.el
index 6f9e6799763..b7c9f359095 100644
--- a/lisp/facemenu.el
+++ b/lisp/facemenu.el
@@ -479,12 +479,20 @@ These special properties include `invisible', `intangible' and `read-only'."
         nil
       col)))
 
-(defun list-colors-display (&optional list buffer-name)
+
+(defun list-colors-display (&optional list buffer-name callback)
   "Display names of defined colors, and show what they look like.
 If the optional argument LIST is non-nil, it should be a list of
 colors to display.  Otherwise, this command computes a list of
-colors that the current display can handle.  If the optional
-argument BUFFER-NAME is nil, it defaults to *Colors*."
+colors that the current display can handle.
+
+If the optional argument BUFFER-NAME is nil, it defaults to
+*Colors*.
+
+If the optional argument CALLBACK is non-nil, it should be a
+function to call each time the user types RET or clicks on a
+color.  The function should accept a single argument, the color
+name."
   (interactive)
   (when (and (null list) (> (display-color-cells) 0))
     (setq list (list-colors-duplicates (defined-colors)))
@@ -493,49 +501,57 @@ argument BUFFER-NAME is nil, it defaults to *Colors*."
       (let ((lc (nthcdr (1- (display-color-cells)) list)))
         (if lc
             (setcdr lc nil)))))
-  (with-help-window (or buffer-name "*Colors*")
-    (with-current-buffer standard-output
+  (let ((buf (get-buffer-create "*Colors*")))
+    (with-current-buffer buf
+      (erase-buffer)
       (setq truncate-lines t)
-      (if temp-buffer-show-function
-          (list-colors-print list)
-        ;; Call list-colors-print from temp-buffer-show-hook
-        ;; to get the right value of window-width in list-colors-print
-        ;; after the buffer is displayed.
-        (add-hook 'temp-buffer-show-hook
-                  (lambda ()
-                    (set-buffer-modified-p
-                     (prog1 (buffer-modified-p)
-                       (list-colors-print list))))
-                  nil t)))))
-
-(defun list-colors-print (list)
-  (dolist (color list)
-    (if (consp color)
-        (if (cdr color)
-            (setq color (sort color (lambda (a b)
-                                      (string< (downcase a)
-                                               (downcase b))))))
-      (setq color (list color)))
-    (put-text-property
-     (prog1 (point)
-       (insert (car color))
-       (indent-to 22))
-     (point)
-     'face (list ':background (car color)))
-    (put-text-property
-     (prog1 (point)
-       (insert " " (if (cdr color)
-                       (mapconcat 'identity (cdr color) ", ")
-                     (car color))))
-     (point)
-     'face (list ':foreground (car color)))
-    (indent-to (max (- (window-width) 8) 44))
-    (insert (apply 'format "#%02x%02x%02x"
-                   (mapcar (lambda (c) (lsh c -8))
-                           (color-values (car color)))))
-
-    (insert "\n"))
-  (goto-char (point-min)))
+      (list-colors-print list callback)
+      (set-buffer-modified-p nil))
+    (pop-to-buffer buf))
+  (if callback
+      (message "Click on a color to select it.")))
+
+(defun list-colors-print (list &optional callback)
+  (let ((callback-fn
+         (if callback
+             `(lambda (button)
+                (funcall ,callback (button-get button 'color-name))))))
+    (dolist (color list)
+      (if (consp color)
+          (if (cdr color)
+              (setq color (sort color (lambda (a b)
+                                        (string< (downcase a)
+                                                 (downcase b))))))
+        (setq color (list color)))
+      (let* ((opoint (point))
+             (color-values (color-values (car color)))
+             (light-p (>= (apply 'max color-values)
+                          (* (car (color-values "white")) .5))))
+        (insert (car color))
+        (indent-to 22)
+        (put-text-property opoint (point) 'face `(:background ,(car color)))
+        (put-text-property
+         (prog1 (point)
+           (insert " " (if (cdr color)
+                           (mapconcat 'identity (cdr color) ", ")
+                         (car color))))
+         (point)
+         'face (list :foreground (car color)))
+        (indent-to (max (- (window-width) 8) 44))
+        (insert (apply 'format "#%02x%02x%02x"
+                       (mapcar (lambda (c) (lsh c -8))
+                               color-values)))
+        (when callback
+          (make-text-button
+           opoint (point)
+           'follow-link t
+           'mouse-face (list :background (car color)
+                             :foreground (if light-p "black" "white"))
+           'color-name (car color)
+           'action callback-fn)))
+      (insert "\n"))
+    (goto-char (point-min))))
+
 
 (defun list-colors-duplicates (&optional list)
   "Return a list of colors with grouped duplicate colors.
diff --git a/lisp/files.el b/lisp/files.el
index f0a8d72d3f0..07442d4ba14 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2269,7 +2269,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\)\\'" . archive-mode)
      ("\\.dtd\\'" . sgml-mode)
      ("\\.ds\\(ss\\)?l\\'" . dsssl-mode)
      ("\\.js\\'" . js-mode)             ; javascript-mode would be better
-     ("\\.[ds]?v\\'" . verilog-mode)
+     ("\\.[ds]?vh?\\'" . verilog-mode)
      ;; .emacs or .gnus or .viper following a directory delimiter in
      ;; Unix, MSDOG or VMS syntax.
      ("[]>:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode)
@@ -3112,14 +3112,17 @@ is specified, returning t if it is specified."
           ;; Otherwise, set the variables.
           (enable-local-variables
            (hack-local-variables-filter result nil)
-           (when file-local-variables-alist
-             ;; Any 'evals must run in the Right sequence.
-             (setq file-local-variables-alist
-                   (nreverse file-local-variables-alist))
-             (run-hooks 'before-hack-local-variables-hook)
-             (dolist (elt file-local-variables-alist)
-               (hack-one-local-variable (car elt) (cdr elt))))
-           (run-hooks 'hack-local-variables-hook)))))
+           (hack-local-variables-apply)))))
+
+(defun hack-local-variables-apply ()
+  (when file-local-variables-alist
+    ;; Any 'evals must run in the Right sequence.
+    (setq file-local-variables-alist
+          (nreverse file-local-variables-alist))
+    (run-hooks 'before-hack-local-variables-hook)
+    (dolist (elt file-local-variables-alist)
+      (hack-one-local-variable (car elt) (cdr elt))))
+  (run-hooks 'hack-local-variables-hook))
 
 (defun safe-local-variable-p (sym val)
   "Non-nil if SYM is safe as a file-local variable with value VAL.
@@ -3413,15 +3416,14 @@ is found.  Returns the new class name."
 Store the directory-local variables in `dir-local-variables-alist'
 and `file-local-variables-alist', without applying them."
   (when (and enable-local-variables
-             (buffer-file-name)
-             (not (file-remote-p (buffer-file-name))))
+             (not (file-remote-p (or (buffer-file-name) default-directory))))
     ;; Find the variables file.
-    (let ((variables-file (dir-locals-find-file (buffer-file-name)))
+    (let ((variables-file (dir-locals-find-file (or (buffer-file-name) default-directory)))
           (class nil)
           (dir-name nil))
       (cond
        ((stringp variables-file)
-        (setq dir-name (file-name-directory (buffer-file-name)))
+        (setq dir-name (if (buffer-file-name) (file-name-directory (buffer-file-name)) default-directory))
         (setq class (dir-locals-read-from-file variables-file)))
        ((consp variables-file)
         (setq dir-name (nth 0 variables-file))
@@ -3438,6 +3440,10 @@ and `file-local-variables-alist', without applying them."
               (push elt dir-local-variables-alist))
             (hack-local-variables-filter variables dir-name)))))))
 
+(defun hack-dir-local-variables-non-file-buffer ()
+  (hack-dir-local-variables)
+  (hack-local-variables-apply))
+
 
 (defcustom change-major-mode-with-file-name t
   "Non-nil means \\[write-file] should set the major mode from the file name.
diff --git a/lisp/hl-line.el b/lisp/hl-line.el
index 1ce4f25af70..755ff696453 100644
--- a/lisp/hl-line.el
+++ b/lisp/hl-line.el
@@ -72,7 +72,7 @@
 (defgroup hl-line nil
   "Highlight the current line."
   :version "21.1"
-  :group 'editing)
+  :group 'convenience)
 
 (defface hl-line
   '((t :inherit highlight))
diff --git a/lisp/image-mode.el b/lisp/image-mode.el
index 5b785f0031e..6169fa4cb71 100644
--- a/lisp/image-mode.el
+++ b/lisp/image-mode.el
@@ -466,7 +466,7 @@ was inserted."
                             (buffer-substring-no-properties (point-min) (point-max)))
                          filename))
          (type (image-type file-or-data nil data-p))
-         (image (create-image file-or-data type data-p))
+         (image (create-animated-image file-or-data type data-p))
          (props
           `(display ,image
                     intangible ,image
diff --git a/lisp/image.el b/lisp/image.el
index 944c6135e23..83ab6288e9a 100644
--- a/lisp/image.el
+++ b/lisp/image.el
@@ -1,7 +1,7 @@
 ;;; image.el --- image API
 
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+;;   2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Maintainer: FSF
 ;; Keywords: multimedia
@@ -584,7 +584,111 @@ Example:
   (declare (doc-string 3))
   `(defvar ,symbol (find-image ',specs) ,doc))
 
+
+;;; Animated image API
 
+(defcustom image-animate-max-time 30
+  "Time in seconds to animate images."
+  :type 'integer
+  :version "24.1"
+  :group 'image)
+
+(defconst image-animated-types '(gif)
+  "List of supported animated image types.")
+
+;;;###autoload
+(defun create-animated-image (file-or-data &optional type data-p &rest props)
+  "Create an animated image.
+FILE-OR-DATA is an image file name or image data.
+Optional TYPE is a symbol describing the image type.  If TYPE is omitted
+or nil, try to determine the image type from its first few bytes
+of image data.  If that doesn't work, and FILE-OR-DATA is a file name,
+use its file extension as image type.
+Optional DATA-P non-nil means FILE-OR-DATA is a string containing image data.
+Optional PROPS are additional image attributes to assign to the image,
+like, e.g. `:mask MASK'.
+Value is the image created, or nil if images of type TYPE are not supported.
+
+Images should not be larger than specified by `max-image-size'."
+  (setq type (image-type file-or-data type data-p))
+  (when (image-type-available-p type)
+    (let* ((animate (memq type image-animated-types))
+           (image
+            (append (list 'image :type type (if data-p :data :file) file-or-data)
+                    (if animate '(:index 0 :mask heuristic))
+                    props)))
+      (if animate
+          (image-animate-start image))
+      image)))
+
+(defun image-animate-timer (image)
+  "Return the animation timer for image IMAGE."
+  ;; See cancel-function-timers
+  (let ((tail timer-list) timer)
+    (while tail
+      (setq timer (car tail)
+            tail (cdr tail))
+      (if (and (eq (aref timer 5) #'image-animate-timeout)
+               (consp (aref timer 6))
+               (eq (car (aref timer 6)) image))
+          (setq tail nil)
+        (setq timer nil)))
+    timer))
+
+(defun image-animate-start (image &optional max-time)
+  "Start animation of image IMAGE.
+Optional second arg MAX-TIME is number of seconds to animate image,
+or t to animate infinitely."
+  (let ((anim (image-animated-p image))
+        timer tmo)
+    (when anim
+      (if (setq timer (image-animate-timer image))
+          (setcar (nthcdr 3 (aref timer 6)) max-time)
+        (setq tmo (* (cdr anim) 0.01))
+        (setq max-time (or max-time image-animate-max-time))
+        (run-with-timer tmo nil #'image-animate-timeout
+                        image 1 (car anim)
+                        (if (numberp max-time)
+                            (- max-time tmo)
+                          max-time))))))
+
+(defun image-animate-stop (image)
+  "Stop animation of image."
+  (let ((timer (image-animate-timer image)))
+    (when timer
+      (cancel-timer timer))))
+
+(defun image-animate-timeout (image ino count time-left)
+  (if (>= ino count)
+      (setq ino 0))
+  (plist-put (cdr image) :index ino)
+  (force-window-update)
+  (let ((anim (image-animated-p image)) tmo)
+    (when anim
+      (setq tmo (* (cdr anim) 0.01))
+      (unless (and (= ino 0) (numberp time-left) (< time-left tmo))
+        (run-with-timer tmo nil #'image-animate-timeout
+                        image (1+ ino) count
+                        (if (numberp time-left)
+                            (- time-left tmo)
+                          time-left))))))
+
+(defun image-animated-p (image)
+  "Return non-nil if image is animated.
+Actually, return value is a cons (IMAGES . DELAY) where IMAGES
+is the number of sub-images in the animated image, and DELAY
+is the delay in 100ths of a second until the next sub-image
+shall be displayed."
+  (cond
+   ((eq (plist-get (cdr image) :type) 'gif)
+    (let* ((extdata (image-extension-data image))
+           (images (plist-get extdata 'count))
+           (anim (plist-get extdata #xF9)))
+      (and (integerp images) (> images 1)
+           (stringp anim) (>= (length anim) 4)
+           (cons images (+ (aref anim 1) (* (aref anim 2) 256))))))))
+
+
 (provide 'image)
 
 ;; arch-tag: 8e76a07b-eb48-4f3e-a7a0-1a7ba9f096b3
diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el
index ac69cf5c7fa..2431c9d9e99 100644
--- a/lisp/language/misc-lang.el
+++ b/lisp/language/misc-lang.el
@@ -50,6 +50,14 @@ and Italian.")))
   :charset-list '(iso-8859-6)
   :mime-charset 'iso-8859-6)
 
+(define-coding-system 'windows-1256
+  "windows-1256 (Arabic) encoding (MIME: WINDOWS-1256)"
+  :coding-type 'charset
+  :mnemonic ?A
+  :charset-list '(windows-1256)
+  :mime-charset 'windows-1256)
+(define-coding-system-alias 'cp1256 'windows-1256)
+
 (provide 'misc-lang)
 
 ;; arch-tag: 6953585c-1a1a-4c09-be82-a2518afb6074
diff --git a/lisp/log-edit.el b/lisp/log-edit.el
index 10c6d480d23..e26521642da 100644
--- a/lisp/log-edit.el
+++ b/lisp/log-edit.el
@@ -368,7 +368,8 @@ commands (under C-x v for VC, for example).
 \\{log-edit-mode-map}"
   (set (make-local-variable 'font-lock-defaults)
        '(log-edit-font-lock-keywords t))
-  (make-local-variable 'log-edit-comment-ring-index))
+  (make-local-variable 'log-edit-comment-ring-index)
+  (hack-dir-local-variables-non-file-buffer))
 
 (defun log-edit-hide-buf (&optional buf where)
   (when (setq buf (get-buffer (or buf log-edit-files-buf)))
diff --git a/lisp/log-view.el b/lisp/log-view.el
index 6fbe8429671..5c454ead5fc 100644
--- a/lisp/log-view.el
+++ b/lisp/log-view.el
@@ -255,7 +255,8 @@ The match group number 1 should match the revision number itself.")
        'log-view-beginning-of-defun)
   (set (make-local-variable 'end-of-defun-function)
        'log-view-end-of-defun)
-  (set (make-local-variable 'cvs-minor-wrap-function) 'log-view-minor-wrap))
+  (set (make-local-variable 'cvs-minor-wrap-function) 'log-view-minor-wrap)
+  (hack-dir-local-variables-non-file-buffer))
 
 ;;;;
 ;;;; Navigation
diff --git a/lisp/mail/metamail.el b/lisp/mail/metamail.el
index 64c7c57f8db..47326b636a1 100644
--- a/lisp/mail/metamail.el
+++ b/lisp/mail/metamail.el
@@ -40,7 +40,6 @@
 (defgroup metamail nil
   "Metamail interface for Emacs."
   :group 'mail
-  :group 'hypermedia
   :group 'processes)
 
 (defcustom metamail-program-name "metamail"
diff --git a/lisp/mail/rfc822.el b/lisp/mail/rfc822.el
index e1e6932a560..2bdf16eff96 100644
--- a/lisp/mail/rfc822.el
+++ b/lisp/mail/rfc822.el
@@ -290,32 +290,36 @@
               (replace-match "\\1 " t))
 
             (goto-char (point-min))
-            (let ((list ())
-                  tem
-                  ;; This is for rfc822-bad-address.  Give it a non-nil
-                  ;; initial value to prevent rfc822-bad-address from
-                  ;; raising a wrong-type-argument error
-                  (rfc822-address-start (point)))
-              (catch 'address         ; this is for rfc822-bad-address
-                (rfc822-nuke-whitespace)
-                (while (not (eobp))
-                  (setq rfc822-address-start (point))
-                  (setq tem
-                        (cond ((rfc822-looking-at ?\,)
-                               nil)
-                              ((looking-at "[][\000-\037@;:\\.>)]")
-                               (forward-char)
-                               (rfc822-bad-address
-                                (format "Strange character \\%c found"
-                                        (preceding-char))))
-                              (t
-                               (rfc822-addresses-1 t))))
-                  (cond ((null tem))
-                        ((stringp tem)
-                         (setq list (cons tem list)))
-                        (t
-                         (setq list (nconc (nreverse tem) list)))))
-                (nreverse list))))
+            ;; Give `rfc822-address-start' a non-nil initial value to
+            ;; prevent `rfc822-bad-address' from raising a
+            ;; `wrong-type-argument' error.
+            (let* ((rfc822-address-start (point))
+                   list tem
+                   (err
+                    (catch 'address
+                      ;; Note that `rfc822-nuke-whitespace' and
+                      ;; `rfc822-looking-at' can throw.
+                      (rfc822-nuke-whitespace)
+                      (while (not (eobp))
+                        (setq rfc822-address-start (point))
+                        (setq tem
+                              (cond ((rfc822-looking-at ?\,)
+                                     nil)
+                                    ((looking-at "[][\000-\037@;:\\.>)]")
+                                     (forward-char)
+                                     (catch 'address ; For rfc822-bad-address
+                                       (rfc822-bad-address
+                                        (format "Strange character \\%c found"
+                                                (preceding-char)))))
+                                    (t
+                                     (rfc822-addresses-1 t))))
+                        (cond ((null tem))
+                              ((stringp tem)
+                               (setq list (cons tem list)))
+                              (t
+                               (setq list (nconc (nreverse tem) list)))))
+                      nil)))
+              (nreverse (append (if err (list err)) list))))
         (and buf (kill-buffer buf))))))
 
 (provide 'rfc822)
diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 83d5e391ffd..4405249d981 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,7 @@
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * Branch for 23.2.
+
 2009-12-01  Bill Wohler  <wohler@newt.com>
 
         * mh-search.el (mh-mairix-execute-search): Use mh vfolder_format.
diff --git a/lisp/net/ange-ftp.el b/lisp/net/ange-ftp.el
index 6e468386749..336ffdadd09 100644
--- a/lisp/net/ange-ftp.el
+++ b/lisp/net/ange-ftp.el
@@ -676,6 +676,7 @@
   "Accessing remote files and directories using FTP
    made as simple and transparent as possible."
   :group 'files
+  :group 'comm
   :prefix "ange-ftp-")
 
 (defcustom ange-ftp-name-format
diff --git a/lisp/net/browse-url.el b/lisp/net/browse-url.el
index 3a5fa8c30a6..261b765eaeb 100644
--- a/lisp/net/browse-url.el
+++ b/lisp/net/browse-url.el
@@ -215,7 +215,8 @@
   "Use a web browser to look at a URL."
   :prefix "browse-url-"
   :link '(emacs-commentary-link "browse-url")
-  :group 'hypermedia)
+  :group 'external
+  :group 'comm)
 
 ;;;###autoload
 (defcustom browse-url-browser-function
diff --git a/lisp/net/goto-addr.el b/lisp/net/goto-addr.el
index fd8c1061bcb..182758aaffb 100644
--- a/lisp/net/goto-addr.el
+++ b/lisp/net/goto-addr.el
@@ -76,7 +76,7 @@
 (defgroup goto-address nil
   "Click to browse URL or to send to e-mail address."
   :group 'mouse
-  :group 'hypermedia)
+  :group 'comm)
 
 
 ;; I don't expect users to want fontify'ing without highlighting.
diff --git a/lisp/net/hmac-def.el b/lisp/net/hmac-def.el
index e388f698100..9cbb919abcc 100644
--- a/lisp/net/hmac-def.el
+++ b/lisp/net/hmac-def.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999, 2001, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
-;; Keywords: HMAC, RFC 2104
+;; Keywords: HMAC, RFC-2104
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/net/hmac-md5.el b/lisp/net/hmac-md5.el
index 86d149ffaae..9bda79d36f0 100644
--- a/lisp/net/hmac-md5.el
+++ b/lisp/net/hmac-md5.el
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1999, 2001, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
 
 ;; Author: Shuhei KOBAYASHI <shuhei@aqua.ocn.ne.jp>
-;; Keywords: HMAC, RFC 2104, HMAC-MD5, MD5, KEYED-MD5, CRAM-MD5
+;; Keywords: HMAC, RFC-2104, HMAC-MD5, MD5, KEYED-MD5, CRAM-MD5
 
 ;; This file is part of GNU Emacs.
 
diff --git a/lisp/net/tramp-imap.el b/lisp/net/tramp-imap.el
index d36569b5c23..92dbb4fef3a 100644
--- a/lisp/net/tramp-imap.el
+++ b/lisp/net/tramp-imap.el
@@ -168,7 +168,7 @@ Operations not mentioned here will be handled by the default Emacs primitives.")
 (defgroup tramp-imap nil
   "Tramp over IMAP configuration."
   :version "23.2"
-  :group 'applications)
+  :group 'tramp)
 
 (defcustom tramp-imap-subject-marker "tramp-imap-subject-marker"
   "The subject marker that Tramp-IMAP will use."
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index c029f073724..8a3ec552d4d 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -176,6 +176,7 @@
 (defgroup tramp nil
   "Edit remote files with a combination of rsh and rcp or similar programs."
   :group 'files
+  :group 'comm
   :version "22.1")
 
 ;; Maybe we need once a real Tramp mode, with key bindings etc.
diff --git a/lisp/net/xesam.el b/lisp/net/xesam.el
index 35df085bc57..03c188006d0 100644
--- a/lisp/net/xesam.el
+++ b/lisp/net/xesam.el
@@ -151,7 +151,7 @@
 (defgroup xesam nil
   "Xesam compatible interface to search engines."
   :group 'extensions
-  :group 'hypermedia
+  :group 'comm
   :version "23.1")
 
 (defcustom xesam-query-type 'user-query
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 8919d920c9d..5eb9840a4ca 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -45,8 +45,7 @@
 
 (defgroup nxml nil
   "New XML editing mode."
-  :group 'languages
-  :group 'wp)
+  :group 'languages)
 
 (defgroup nxml-faces nil
   "Faces for XML syntax highlighting."
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 7ce303b5add..b70fb150735 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * org.el (org): Remove from hypermedia group.
+
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * Branch for 23.2.
+
 2010-02-15  Chong Yidong  <cyd@stupidchicken.com>
 
         * org-freemind.el (org-freemind-from-org-mode-node)
diff --git a/lisp/org/org.el b/lisp/org/org.el
index a404551f3cb..54025f4d83c 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -134,7 +134,6 @@ With prefix arg HERE, insert it at point."
   "Outline-based notes management and organizer."
   :tag "Org"
   :group 'outlines
-  :group 'hypermedia
   :group 'calendar)
 
 (defcustom org-mode-hook nil
diff --git a/lisp/outline.el b/lisp/outline.el
index b5d3d798714..5b10de231f2 100644
--- a/lisp/outline.el
+++ b/lisp/outline.el
@@ -41,7 +41,7 @@
 (defgroup outlines nil
   "Support for hierarchical outlining."
   :prefix "outline-"
-  :group 'editing)
+  :group 'wp)
 
 (defcustom outline-regexp "[*\^L]+"
   "Regular expression to match the beginning of a heading.
diff --git a/lisp/ps-print.el b/lisp/ps-print.el
index 0efac03f7d5..7c7397a52bc 100644
--- a/lisp/ps-print.el
+++ b/lisp/ps-print.el
@@ -1497,7 +1497,7 @@ Please send all bug fixes and enhancements to
   "Support for printing and PostScript."
   :tag "PostScript"
   :version "20"
-  :group 'emacs)
+  :group 'external)
 
 (defgroup ps-print nil
   "PostScript generator for Emacs."
diff --git a/lisp/reveal.el b/lisp/reveal.el
index 9838ade89f1..ff5c8807de5 100644
--- a/lisp/reveal.el
+++ b/lisp/reveal.el
@@ -49,7 +49,7 @@
 
 (defgroup reveal nil
   "Reveal hidden text on the fly."
-  :group 'editing)
+  :group 'convenience)
 
 (defcustom reveal-around-mark t
   "Reveal text around the mark, if active."
diff --git a/lisp/textmodes/picture.el b/lisp/textmodes/picture.el
index 2673ee15457..e4ed2c8a051 100644
--- a/lisp/textmodes/picture.el
+++ b/lisp/textmodes/picture.el
@@ -34,7 +34,7 @@
 (defgroup picture nil
   "Picture mode --- editing using quarter-plane screen model."
   :prefix "picture-"
-  :group 'editing)
+  :group 'wp)
 
 (defcustom picture-rectangle-ctl ?+
   "*Character `picture-draw-rectangle' uses for top left corners."
diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 44933bff327..3e092374207 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -640,14 +640,10 @@
 ;;;
 
 (defgroup table nil
-  "Text based table manipulation utilities.
-See `table-insert' for examples about how to use."
+  "Text based table manipulation utilities."
   :tag "Table"
   :prefix "table-"
-  :group 'editing
   :group 'wp
-  :group 'paragraphs
-  :group 'fill
   :version "22.1")
 
 (defgroup table-hooks nil
diff --git a/lisp/textmodes/text-mode.el b/lisp/textmodes/text-mode.el
index 75897a2cf07..51040824b20 100644
--- a/lisp/textmodes/text-mode.el
+++ b/lisp/textmodes/text-mode.el
@@ -32,7 +32,7 @@
   "Normal hook run when entering Text mode and many related modes."
   :type 'hook
   :options '(turn-on-auto-fill turn-on-flyspell)
-  :group 'data)
+  :group 'wp)
 
 (defvar text-mode-variant nil
   "Non-nil if this buffer's major mode is a variant of Text mode.
diff --git a/lisp/uniquify.el b/lisp/uniquify.el
index ddf15e243c4..27093042efe 100644
--- a/lisp/uniquify.el
+++ b/lisp/uniquify.el
@@ -89,7 +89,7 @@
 
 (defgroup uniquify nil
   "Unique buffer names dependent on file name."
-  :group 'applications)
+  :group 'files)
 
 
 (defcustom uniquify-buffer-name-style nil
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 2a8c6ebe25b..7309402a848 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,11 @@
+2010-03-12  Chong Yidong  <cyd@stupidchicken.com>
+
+        * url-vars.el (url): Put in comm group.
+
+2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
+
+        * Branch for 23.2.
+
 2010-01-23  Chong Yidong  <cyd@stupidchicken.com>
 
         * url-util.el: Require url-vars (Bug#5459).
diff --git a/lisp/url/url-vars.el b/lisp/url/url-vars.el
index 2062f482ede..1b9fd7b76cc 100644
--- a/lisp/url/url-vars.el
+++ b/lisp/url/url-vars.el
@@ -30,7 +30,7 @@
 (defgroup url nil
   "Uniform Resource Locator tool."
   :version "22.1"
-  :group 'hypermedia)
+  :group 'comm)
 
 (defgroup url-file nil
   "URL storage."
diff --git a/lisp/vc-annotate.el b/lisp/vc-annotate.el
index 71839443553..1878fe8740f 100644
--- a/lisp/vc-annotate.el
+++ b/lisp/vc-annotate.el
@@ -162,7 +162,8 @@ menu items."
   (remove-from-invisibility-spec 'foo)
   (set (make-local-variable 'truncate-lines) t)
   (set (make-local-variable 'font-lock-defaults)
-       '(vc-annotate-font-lock-keywords t)))
+       '(vc-annotate-font-lock-keywords t))
+  (hack-dir-local-variables-non-file-buffer))
 
 (defun vc-annotate-toggle-annotation-visibility ()
   "Toggle whether or not the annotation is visible."
diff --git a/lisp/vc-bzr.el b/lisp/vc-bzr.el
index b0dbb8ec192..75845f0aa2c 100644
--- a/lisp/vc-bzr.el
+++ b/lisp/vc-bzr.el
@@ -758,9 +758,11 @@ stream.  Standard error output is discarded."
 
     (define-key map [down-mouse-3] 'vc-bzr-shelve-menu)
     (define-key map "\C-k" 'vc-bzr-shelve-delete-at-point)
-    ;; (define-key map "=" 'vc-bzr-shelve-show-at-point)
-    ;; (define-key map "\C-m" 'vc-bzr-shelve-show-at-point)
+    (define-key map "=" 'vc-bzr-shelve-show-at-point)
+    (define-key map "\C-m" 'vc-bzr-shelve-show-at-point)
+    (define-key map "A" 'vc-bzr-shelve-apply-and-keep-at-point)
     (define-key map "P" 'vc-bzr-shelve-apply-at-point)
+    (define-key map "S" 'vc-bzr-shelve-snapshot)
     map))
 
 (defvar vc-bzr-shelve-menu-map
@@ -768,16 +770,22 @@ stream.  Standard error output is discarded."
     (define-key map [de]
       '(menu-item "Delete shelf" vc-bzr-shelve-delete-at-point
                   :help "Delete the current shelf"))
+    (define-key map [ap]
+      '(menu-item "Apply and keep shelf" vc-bzr-shelve-apply-and-keep-at-point
+                  :help "Apply the current shelf and keep it"))
     (define-key map [po]
       '(menu-item "Apply and remove shelf (pop)" vc-bzr-shelve-apply-at-point
                   :help "Apply the current shelf and remove it"))
-    ;; (define-key map [sh]
-    ;;   '(menu-item "Show shelve" vc-bzr-shelve-show-at-point
-    ;;            :help "Show the contents of the current shelve"))
+    (define-key map [sh]
+      '(menu-item "Show shelve" vc-bzr-shelve-show-at-point
+                  :help "Show the contents of the current shelve"))
     map))
 
 (defvar vc-bzr-extra-menu-map
   (let ((map (make-sparse-keymap)))
+    (define-key map [bzr-sn]
+      '(menu-item "Shelve a snapshot" vc-bzr-shelve-snapshot
+                  :help "Shelve the current state of the tree and keep the current state"))
     (define-key map [bzr-sh]
       '(menu-item "Shelve..." vc-bzr-shelve
                   :help "Shelve changes"))
@@ -864,16 +872,16 @@ stream.  Standard error output is discarded."
       (vc-bzr-command "shelve" nil 0 nil "--all" "-m" name)
       (vc-resynch-buffer root t t))))
 
-;; (defun vc-bzr-shelve-show (name)
-;;   "Show the contents of shelve NAME."
-;;   (interactive "sShelve name: ")
-;;   (vc-setup-buffer "*vc-bzr-shelve*")
-;;   ;; FIXME: how can you show the contents of a shelf?
-;;   (vc-bzr-command "shelve" "*vc-bzr-shelve*" 'async nil name)
-;;   (set-buffer "*vc-bzr-shelve*")
-;;   (diff-mode)
-;;   (setq buffer-read-only t)
-;;   (pop-to-buffer (current-buffer)))
+(defun vc-bzr-shelve-show (name)
+  "Show the contents of shelve NAME."
+  (interactive "sShelve name: ")
+  (vc-setup-buffer "*vc-bzr-shelve*")
+  ;; FIXME: how can you show the contents of a shelf?
+  (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 'async nil "--preview" name)
+  (set-buffer "*vc-bzr-shelve*")
+  (diff-mode)
+  (setq buffer-read-only t)
+  (pop-to-buffer (current-buffer)))
 
 (defun vc-bzr-shelve-apply (name)
   "Apply shelve NAME and remove it afterwards."
@@ -881,6 +889,23 @@ stream.  Standard error output is discarded."
   (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 0 nil "--apply" name)
   (vc-resynch-buffer (vc-bzr-root default-directory) t t))
 
+(defun vc-bzr-shelve-apply-and-keep (name)
+  "Apply shelve NAME and keep it afterwards."
+  (interactive "sApply (and keep) shelf: ")
+  (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 0 nil "--apply" "--keep" name)
+  (vc-resynch-buffer (vc-bzr-root default-directory) t t))
+
+(defun vc-bzr-shelve-snapshot ()
+  "Create a stash with the current tree state."
+  (interactive)
+  (vc-bzr-command "shelve" nil 0 nil "--all" "-m"
+                  (let ((ct (current-time)))
+                    (concat
+                     (format-time-string "Snapshot on %Y-%m-%d" ct)
+                     (format-time-string " at %H:%M" ct))))
+  (vc-bzr-command "unshelve" "*vc-bzr-shelve*" 0 nil "--apply" "--keep")
+  (vc-resynch-buffer (vc-bzr-root default-directory) t t))
+
 (defun vc-bzr-shelve-list ()
   (with-temp-buffer
     (vc-bzr-command "shelve" (current-buffer) 1 nil "--list" "-q")
@@ -905,14 +930,18 @@ stream.  Standard error output is discarded."
       (vc-bzr-command "unshelve" nil 0 nil "--delete-only" shelve)
       (vc-dir-refresh))))
 
-;; (defun vc-bzr-shelve-show-at-point ()
-;;   (interactive)
-;;   (vc-bzr-shelve-show (vc-bzr-shelve-get-at-point (point))))
+(defun vc-bzr-shelve-show-at-point ()
+  (interactive)
+  (vc-bzr-shelve-show (vc-bzr-shelve-get-at-point (point))))
 
 (defun vc-bzr-shelve-apply-at-point ()
   (interactive)
   (vc-bzr-shelve-apply (vc-bzr-shelve-get-at-point (point))))
 
+(defun vc-bzr-shelve-apply-and-keep-at-point ()
+  (interactive)
+  (vc-bzr-shelve-apply-and-keep (vc-bzr-shelve-get-at-point (point))))
+
 (defun vc-bzr-shelve-menu (e)
   (interactive "e")
   (vc-dir-at-event e (popup-menu vc-bzr-shelve-menu-map e)))
diff --git a/lisp/vc-dir.el b/lisp/vc-dir.el
index 2f661e8becf..a0350eb3013 100644
--- a/lisp/vc-dir.el
+++ b/lisp/vc-dir.el
@@ -938,6 +938,7 @@ the *vc-dir* buffer.
     ;; Make sure that if the directory buffer is killed, the update
     ;; process running in the background is also killed.
     (add-hook 'kill-buffer-query-functions 'vc-dir-kill-query nil t)
+    (hack-dir-local-variables-non-file-buffer)
     (vc-dir-refresh)))
 
 (defun vc-dir-headers (backend dir)
diff --git a/lisp/vc-git.el b/lisp/vc-git.el
index d645a4c05ba..eab3b650fa4 100644
--- a/lisp/vc-git.el
+++ b/lisp/vc-git.el
@@ -587,7 +587,7 @@ or an empty string if none."
                 '("log" "--no-color")
                 (when shortlog
                   '("--graph" "--decorate" "--date=short"
-                    "--pretty=format:%d%h  %ad  %s" "--abbrev-commit"))
+                    "--pretty=tformat:%d%h  %ad  %s" "--abbrev-commit"))
                 (when limit (list "-n" (format "%s" limit)))
                 (when start-revision (list start-revision))
                 '("--")))))))
@@ -673,7 +673,8 @@ or BRANCH^ (where \"^\" can be repeated)."
     (with-temp-buffer
       (vc-git-command t nil nil "for-each-ref" "--format=%(refname)")
       (goto-char (point-min))
-      (while (re-search-forward "^refs/\\(heads\\|tags\\)/\\(.*\\)$" nil t)
+      (while (re-search-forward "^refs/\\(heads\\|tags\\|remotes\\)/\\(.*\\)$"
+                                nil t)
         (push (match-string 2) table)))
     table))
 
@@ -703,7 +704,8 @@ or BRANCH^ (where \"^\" can be repeated)."
     (when (looking-at "\\([0-9a-f^][0-9a-f]+\\) \\(\\([^(]+\\) \\)?")
       (let ((revision (match-string-no-properties 1)))
         (if (match-beginning 2)
-          (cons revision (expand-file-name (match-string-no-properties 3)))
+            (cons revision (expand-file-name (match-string-no-properties 3)
+                                             (vc-git-root default-directory)))
           revision)))))
 
 ;;; TAG SYSTEM
diff --git a/lisp/vcursor.el b/lisp/vcursor.el
index 3573a86ad49..9e8fbf431f1 100644
--- a/lisp/vcursor.el
+++ b/lisp/vcursor.el
@@ -325,7 +325,7 @@
 (defgroup vcursor nil
   "Manipulate an alternative (\"virtual\") cursor."
   :prefix "vcursor-"
-  :group 'editing)
+  :group 'convenience)
 
 (defface vcursor
   '((((class color)) (:foreground "blue" :background "cyan" :underline t))
diff --git a/lisp/version.el b/lisp/version.el
index 905733a56b3..5cd0cc8d634 100644
--- a/lisp/version.el
+++ b/lisp/version.el
@@ -32,7 +32,7 @@
 (defconst emacs-copyright "Copyright (C) 2010 Free Software Foundation, Inc." "\
 Short copyright string for this version of Emacs.")
 
-(defconst emacs-version "23.1.93" "\
+(defconst emacs-version "24.0.50" "\
 Version numbers of this version of Emacs.")
 
 (defconst emacs-major-version (progn (string-match "^[0-9]+" emacs-version) (string-to-number (match-string 0 emacs-version))) "\
diff --git a/lisp/view.el b/lisp/view.el
index 219af1b6e1e..63db3452a87 100644
--- a/lisp/view.el
+++ b/lisp/view.el
@@ -48,8 +48,7 @@
   "Peruse file or buffer without editing."
   :link '(function-link view-mode)
   :link '(custom-manual "(emacs)Misc File Ops")
-  :group 'wp
-  :group 'editing)
+  :group 'wp)
 
 (defcustom view-highlight-face 'highlight
    "The face used for highlighting the match found by View mode search."
diff --git a/lisp/whitespace.el b/lisp/whitespace.el
index 183698a28f3..79ce9a330d4 100644
--- a/lisp/whitespace.el
+++ b/lisp/whitespace.el
@@ -378,8 +378,7 @@
   "Visualize blanks (TAB, (HARD) SPACE and NEWLINE)."
   :link '(emacs-library-link :tag "Source Lisp File" "whitespace.el")
   :version "23.1"
-  :group 'wp
-  :group 'data)
+  :group 'convenience)
 
 
 (defcustom whitespace-style
diff --git a/lisp/wid-edit.el b/lisp/wid-edit.el
index a087f17a900..6296a965df9 100644
--- a/lisp/wid-edit.el
+++ b/lisp/wid-edit.el
@@ -78,8 +78,7 @@
   :link '(custom-manual "(widget)Top")
   :link '(emacs-library-link :tag "Lisp File" "widget.el")
   :prefix "widget-"
-  :group 'extensions
-  :group 'hypermedia)
+  :group 'extensions)
 
 (defgroup widget-documentation nil
   "Options controlling the display of documentation strings."
@@ -639,8 +638,7 @@ extension (xpm, xbm, gif, jpg, or png) located in
            (dolist (elt widget-image-conversion)
              (dolist (ext (cdr elt))
                (push (list :type (car elt) :file (concat image ext)) specs)))
-           (setq specs (nreverse specs))
-           (find-image specs)))
+           (find-image (nreverse specs))))
         (t
          ;; Oh well.
          nil)))
@@ -657,7 +655,7 @@ IMAGE should either be an image or an image file name sans extension
 
 Optional arguments DOWN and INACTIVE are used instead of IMAGE when the
 button is pressed or inactive, respectively.  These are currently ignored."
-  (if (and (display-graphic-p)
+  (if (and (featurep 'image)
            (setq image (widget-image-find image)))
       (progn (widget-put widget :suppress-face t)
              (insert-image image tag))
@@ -1874,6 +1872,7 @@ by some other text in the `:format' string (if specified)."
   :valid-regexp ""
   :error "Field's value doesn't match allowed forms"
   :value-create 'widget-field-value-create
+  :value-set 'widget-field-value-set
   :value-delete 'widget-field-value-delete
   :value-get 'widget-field-value-get
   :match 'widget-field-match)
@@ -1912,6 +1911,18 @@ the earlier input."
                         (widget-apply widget :value-get))
     widget))
 
+(defun widget-field-value-set (widget value)
+  "Set an editable text field WIDGET to VALUE"
+  (let ((from (widget-field-start widget))
+        (to (widget-field-text-end widget))
+        (buffer (widget-field-buffer widget))
+        (size (widget-get widget :size)))
+    (when (and from to (buffer-live-p buffer))
+      (with-current-buffer buffer
+        (goto-char from)
+        (delete-char (- to from))
+        (insert value)))))
+
 (defun widget-field-value-create (widget)
   "Create an editable text field."
   (let ((size (widget-get widget :size))
@@ -1949,7 +1960,6 @@ the earlier input."
   (let ((from (widget-field-start widget))
         (to (widget-field-text-end widget))
         (buffer (widget-field-buffer widget))
-        (size (widget-get widget :size))
         (secret (widget-get widget :secret))
         (old (current-buffer)))
     (if (and from to)
@@ -2806,11 +2816,19 @@ Return an alist of (TYPE MATCH)."
 ;;; The `visibility' Widget.
 
 (define-widget 'visibility 'item
-  "An indicator and manipulator for hidden items."
+  "An indicator and manipulator for hidden items.
+
+The following properties have special meanings for this widget:
+:on-image  Image filename or spec to display when the item is visible.
+:on        Text shown if the \"on\" image is nil or cannot be displayed.
+:off-image Image filename or spec to display when the item is hidden.
+:off       Text shown if the \"off\" image is nil cannot be displayed."
   :format "%[%v%]"
   :button-prefix ""
   :button-suffix ""
+  :on-image "down"
   :on "Hide"
+  :off-image "right"
   :off "Show"
   :value-create 'widget-visibility-value-create
   :action 'widget-toggle-action
@@ -2818,21 +2836,17 @@ Return an alist of (TYPE MATCH)."
 
 (defun widget-visibility-value-create (widget)
   ;; Insert text representing the `on' and `off' states.
-  (let ((on (widget-get widget :on))
-        (off (widget-get widget :off)))
-    (if on
-        (setq on (concat widget-push-button-prefix
-                         on
-                         widget-push-button-suffix))
-      (setq on ""))
-    (if off
-        (setq off (concat widget-push-button-prefix
-                          off
-                          widget-push-button-suffix))
-      (setq off ""))
-    (if (widget-value widget)
-        (widget-image-insert widget on "down" "down-pushed")
-      (widget-image-insert widget off "right" "right-pushed"))))
+  (let* ((val (widget-value widget))
+         (text (widget-get widget (if val :on :off)))
+         (img (widget-image-find
+               (widget-get widget (if val :on-image :off-image)))))
+    (widget-image-insert widget
+                         (if text
+                             (concat widget-push-button-prefix text
+                                     widget-push-button-suffix)
+                           "")
+                         (if img
+                             (append img '(:ascent center))))))
 
 ;;; The `documentation-link' Widget.
 ;;
@@ -2935,7 +2949,7 @@ link for that string."
                 (widget-create-child-and-convert
                  widget (widget-get widget :visibility-widget)
                  :help-echo "Show or hide rest of the documentation."
-                 :on "Hide Rest"
+                 :on "Hide"
                  :off "More"
                  :always-active t
                  :action 'widget-parent-action
@@ -3692,6 +3706,7 @@ example:
 (define-widget 'color 'editable-field
   "Choose a color name (with sample)."
   :format "%{%t%}: %v (%{sample%})\n"
+  :value-create 'widget-color-value-create
   :size 10
   :tag "Color"
   :value "black"
@@ -3700,6 +3715,27 @@ example:
   :notify 'widget-color-notify
   :action 'widget-color-action)
 
+(defun widget-color-value-create (widget)
+  (widget-field-value-create widget)
+  (widget-insert " ")
+  (widget-create-child-and-convert
+   widget 'push-button
+   :tag "Choose" :action 'widget-color--choose-action)
+  (widget-insert " "))
+
+(defun widget-color--choose-action (widget &optional event)
+  (list-colors-display
+   nil nil
+   `(lambda (color)
+      (when (buffer-live-p ,(current-buffer))
+        (widget-value-set ',(widget-get widget :parent) color)
+        (let* ((buf (get-buffer "*Colors*"))
+               (win (get-buffer-window buf 0)))
+          (bury-buffer buf)
+          (and win (> (length (window-list)) 1)
+               (delete-window win)))
+        (pop-to-buffer ,(current-buffer))))))
+
 (defun widget-color-complete (widget)
   "Complete the color in WIDGET."
   (require 'facemenu)                   ; for facemenu-color-alist