from trunk

20 files changed, 131 insertions, 39 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index a5ab8ee4452..b67b69a361b 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * etc/images/custom/down-pushed.xpm, etc/images/custom/down.xpm:
+        * etc/images/custom/right-pushed.xpm:
+        * etc/images/custom/right-pushed.xpm: Increase height by four
+        pixels, to improve text alignment.
+
 2010-01-16  Mario Lang  <mlang@delysid.org>
 
         * srecode/doc-cpp.srt, srecode/doc-default.srt:
diff --git a/etc/images/custom/down-pushed.xpm b/etc/images/custom/down-pushed.xpm
index a3b8fc909b9..7342336956b 100644
--- a/etc/images/custom/down-pushed.xpm
+++ b/etc/images/custom/down-pushed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * down_pushed_xpm[] = {
-"8 8 4 1",
+"8 12 4 1",
 "       c none",
 ".      c gray45",
 "X      c gray90",
@@ -12,4 +12,8 @@ static char * down_pushed_xpm[] = {
 "  .OOX  ",
 "  .OOX  ",
 "   OX   ",
-"   OX   "};
+"   OX   ",
+"        ",
+"        ",
+"        ",
+"        "};
diff --git a/etc/images/custom/down.xpm b/etc/images/custom/down.xpm
index 4205c6130f8..4ddb255bc44 100644
--- a/etc/images/custom/down.xpm
+++ b/etc/images/custom/down.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * down_xpm[] = {
-"8 8 4 1",
+"8 12 4 1",
 "       c none",
 ".      c gray90",
 "X      c gray45",
@@ -12,4 +12,8 @@ static char * down_xpm[] = {
 "  .OOX  ",
 "  .OOX  ",
 "   OX   ",
-"   OX   "};
+"   OX   ",
+"        ",
+"        ",
+"        ",
+"        "};
diff --git a/etc/images/custom/right-pushed.xpm b/etc/images/custom/right-pushed.xpm
index ca17b3a4825..1b8aeaf7776 100644
--- a/etc/images/custom/right-pushed.xpm
+++ b/etc/images/custom/right-pushed.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * right_pushed_xpm[] = {
-"8 8 4 1",
+"8 12 4 1",
 "       c none",
 ".      c gray45",
 "X      c gray90",
@@ -12,4 +12,8 @@ static char * right_pushed_xpm[] = {
 "..OOOOXX",
 "..OOXX  ",
 "..XX    ",
-"OO      "};
+"OO      ",
+"        ",
+"        ",
+"        ",
+"        "};
diff --git a/etc/images/custom/right.xpm b/etc/images/custom/right.xpm
index 726830bab4a..c75f7e74058 100644
--- a/etc/images/custom/right.xpm
+++ b/etc/images/custom/right.xpm
@@ -1,6 +1,6 @@
 /* XPM */
 static char * right_xpm[] = {
-"8 8 4 1",
+"8 12 4 1",
 "       c none",
 ".      c gray90",
 "X      c gray45",
@@ -12,4 +12,8 @@ static char * right_xpm[] = {
 "..OOOOXX",
 "..OOXX  ",
 "..XX    ",
-"OO      "};
+"OO      ",
+"        ",
+"        ",
+"        ",
+"        " };
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0dbc97c0df8..17655fe4f6b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,38 @@
+2010-02-16  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix
+        errors in copying directories.
+        (tramp-handle-add-name-to-file, tramp-handle-copy-directory)
+        (tramp-do-copy-or-rename-file, tramp-handle-delete-directory)
+        (tramp-handle-delete-file)
+        (tramp-handle-dired-recursive-delete-directory)
+        (tramp-handle-write-region): Flush also the cache for the upper
+        directory.
+
+2010-02-16  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (save-interprogram-paste-before-kill): Doc fix.
+
+        * cus-edit.el (hardware): Doc fix.
+
+        * man.el (man): Add to external custom group.
+
+        * delim-col.el (columns): Move to wp custom group.
+
+        * doc-view.el (doc-view): Add to data custom group.
+
+        * cedet/data-debug.el (data-debug): Move to extensions group.
+
+        * cedet/ede.el (ede):
+        * cedet/srecode.el (srecode):
+        * cedet/semantic.el (semantic): Put in tools and extensions group.
+
+        * nxml/nxml-mode.el (nxml-faces): Remove from font-lock-faces
+        group.
+
+        * textmodes/flyspell.el (flyspell-word): Obey the offset specified
+        by ispell-parse-output (Bug#5575).
+
 2010-02-16  Kenichi Handa  <handa@m17n.org>
 
         * international/ja-dic-cnv.el (iso-2022-7bit-short): Delete it.
diff --git a/lisp/cedet/data-debug.el b/lisp/cedet/data-debug.el
index 5fa32ecca3e..ed8441d2df0 100644
--- a/lisp/cedet/data-debug.el
+++ b/lisp/cedet/data-debug.el
@@ -842,7 +842,7 @@ If PARENT is non-nil, it is somehow related as a parent to thing."
 ;;
 (defgroup data-debug nil
   "data-debug group."
-  :group 'languages)
+  :group 'extensions)
 
 (defvar data-debug-mode-syntax-table
   (let ((table (make-syntax-table (standard-syntax-table))))
diff --git a/lisp/cedet/ede.el b/lisp/cedet/ede.el
index 096ed04ea80..46fcdb000f8 100644
--- a/lisp/cedet/ede.el
+++ b/lisp/cedet/ede.el
@@ -69,10 +69,9 @@
   (interactive) (message "EDE %s" ede-version))
 
 (defgroup ede nil
-  "Emacs Development Environment gloss."
+  "Emacs Development Environment."
   :group 'tools
-  :group 'convenience
-  )
+  :group 'extensions)
 
 (defcustom ede-auto-add-method 'ask
   "Whether a new source file should be automatically added to a target.
diff --git a/lisp/cedet/semantic.el b/lisp/cedet/semantic.el
index b7d5f700d78..14b196bbe22 100644
--- a/lisp/cedet/semantic.el
+++ b/lisp/cedet/semantic.el
@@ -63,7 +63,7 @@ introduced."
 
 (defgroup semantic nil
   "Parser Generator and parser framework."
-  :group 'lisp)
+  :group 'tools)
 
 (defgroup semantic-faces nil
   "Faces used for Semantic enabled tools."
diff --git a/lisp/cedet/srecode.el b/lisp/cedet/srecode.el
index 5f19327f59e..a903ffd0af1 100644
--- a/lisp/cedet/srecode.el
+++ b/lisp/cedet/srecode.el
@@ -46,6 +46,7 @@
 ;;; Code:
 (defgroup srecode nil
   "Semantic Recoder."
+  :group 'extensions
   :group 'tools)
 
 (provide 'srecode)
diff --git a/lisp/cus-edit.el b/lisp/cus-edit.el
index 6353894d6e8..b815e31f31c 100644
--- a/lisp/cus-edit.el
+++ b/lisp/cus-edit.el
@@ -281,7 +281,7 @@
   :group 'environment)
 
 (defgroup hardware nil
-  "Support for interfacing with exotic hardware."
+  "Support for interfacing with miscellaneous hardware."
   :group 'environment)
 
 (defgroup terminals nil
diff --git a/lisp/delim-col.el b/lisp/delim-col.el
index 945231246c3..d0c1223c558 100644
--- a/lisp/delim-col.el
+++ b/lisp/delim-col.el
@@ -126,7 +126,7 @@
   "Prettify columns."
   :link '(emacs-library-link :tag "Source Lisp File" "delim-col.el")
   :prefix "delimit-columns-"
-  :group 'internal)
+  :group 'wp)
 
 (defcustom delimit-columns-str-before ""
   "Specify a string to be inserted before all columns."
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 77a075b716f..528d5979ce1 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -144,6 +144,7 @@
   :link '(function-link doc-view)
   :version "22.2"
   :group 'applications
+  :group 'data
   :group 'multimedia
   :prefix "doc-view-")
 
diff --git a/lisp/man.el b/lisp/man.el
index a92caf49ec1..d64846a2d4d 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -98,9 +98,9 @@
 (defgroup man nil
   "Browse UNIX manual pages."
   :prefix "Man-"
+  :group 'external
   :group 'help)
 
-
 (defvar Man-notify)
 (defcustom Man-filter-list nil
   "Manpage cleaning filter command phrases.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index e59383e31e7..77a3875eeb4 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -3420,6 +3420,7 @@ tramp-handle-file-name-all-completions: internal error accessing `%s': `%s'"
           (tramp-error
            v2 'file-error
            "add-name-to-file: file %s already exists" newname))
+        (tramp-flush-file-property v2 (file-name-directory v2-localname))
         (tramp-flush-file-property v2 v2-localname)
         (tramp-barf-unless-okay
          v1
@@ -3478,7 +3479,13 @@ tramp-handle-file-name-all-completions: internal error accessing `%s': `%s'"
              'copy dirname newname keep-date))
         ;; We must do it file-wise.
         (tramp-run-real-handler
-         'copy-directory (list dirname newname keep-date parents))))))
+         'copy-directory (list dirname newname keep-date parents)))
+
+      ;; When newname did exist, we have wrong cached values.
+      (when t2
+        (with-parsed-tramp-file-name newname nil
+          (tramp-flush-file-property v (file-name-directory localname))
+          (tramp-flush-file-property v localname))))))
 
 (defun tramp-handle-rename-file
   (filename newname &optional ok-if-already-exists)
@@ -3583,11 +3590,13 @@ and `rename'.  FILENAME and NEWNAME must be absolute file names."
       ;; In case of `rename', we must flush the cache of the source file.
       (when (and t1 (eq op 'rename))
         (with-parsed-tramp-file-name filename nil
+          (tramp-flush-file-property v (file-name-directory localname))
           (tramp-flush-file-property v localname)))
 
       ;; When newname did exist, we have wrong cached values.
       (when t2
         (with-parsed-tramp-file-name newname nil
+          (tramp-flush-file-property v (file-name-directory localname))
           (tramp-flush-file-property v localname)))
 
       (with-parsed-tramp-file-name (if t1 filename newname) nil
@@ -3789,7 +3798,13 @@ The method used must be an out-of-band method."
 
           ;; Both are Tramp files.  We shall optimize it, when the
           ;; methods for filename and newname are the same.
-          (let ((tmpfile (tramp-compat-make-temp-file localname)))
+          (let ((tmpfile
+                 (if (file-regular-p filename)
+                     (tramp-compat-make-temp-file localname)
+                   (make-temp-name
+                    (expand-file-name
+                     tramp-temp-name-prefix
+                     (tramp-compat-temporary-file-directory))))))
             (unwind-protect
                 (progn
                   (tramp-do-copy-or-rename-file-out-of-band
@@ -3798,7 +3813,9 @@ The method used must be an out-of-band method."
                    'rename tmpfile newname keep-date))
               ;; Save exit.
               (condition-case nil
-                  (delete-file tmpfile)
+                  (if (file-regular-p tmpfile)
+                      (delete-file tmpfile)
+                    (delete-directory tmpfile 'recursive))
                 (error))))
 
         ;; Expand hops.  Might be necessary for gateway methods.
@@ -3913,7 +3930,9 @@ The method used must be an out-of-band method."
 
       ;; If the operation was `rename', delete the original file.
       (unless (eq op 'copy)
-        (delete-file filename)))))
+        (if (file-regular-p filename)
+            (delete-file filename)
+          (delete-directory filename 'recursive))))))
 
 (defun tramp-handle-make-directory (dir &optional parents)
   "Like `make-directory' for Tramp files."
@@ -3932,6 +3951,7 @@ The method used must be an out-of-band method."
   "Like `delete-directory' for Tramp files."
   (setq directory (expand-file-name directory))
   (with-parsed-tramp-file-name directory nil
+    (tramp-flush-file-property v (file-name-directory localname))
     (tramp-flush-directory-property v localname)
     (unless (zerop (tramp-send-command-and-check
                     v
@@ -3945,6 +3965,7 @@ The method used must be an out-of-band method."
   "Like `delete-file' for Tramp files."
   (setq filename (expand-file-name filename))
   (with-parsed-tramp-file-name filename nil
+    (tramp-flush-file-property v (file-name-directory localname))
     (tramp-flush-file-property v localname)
     (unless (zerop (tramp-send-command-and-check
                     v
@@ -3974,6 +3995,7 @@ This is like `dired-recursive-delete-directory' for Tramp files."
     ;; This might take a while, allow it plenty of time.
     (tramp-wait-for-output (tramp-get-connection-process v) 120)
     ;; Make sure that it worked...
+    (tramp-flush-file-property v (file-name-directory localname))
     (tramp-flush-directory-property v localname)
     (and (file-exists-p filename)
          (tramp-error
@@ -4953,11 +4975,9 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file."
                   (or (file-directory-p localname)
                       (file-writable-p localname)))))
           ;; Short track: if we are on the local host, we can run directly.
-          (progn
-            (tramp-run-real-handler
-             'write-region
-             (list start end localname append 'no-message lockname confirm))
-            (tramp-flush-file-property v localname))
+          (tramp-run-real-handler
+           'write-region
+           (list start end localname append 'no-message lockname confirm))
 
         (let ((rem-dec (tramp-get-remote-coding v "remote-decoding"))
               (loc-enc (tramp-get-local-coding v "local-encoding"))
@@ -5121,8 +5141,7 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file."
                               " decode using `%s' failed")
                       filename rem-dec)))
                   (tramp-message
-                   v 5 "Decoding region into remote file %s...done" filename)
-                  (tramp-flush-file-property v localname))
+                   v 5 "Decoding region into remote file %s...done" filename))
 
               ;; Save exit.
               (delete-file tmpfile)))
@@ -5139,6 +5158,9 @@ Returns a file name in `tramp-auto-save-directory' for autosaving this file."
           (when coding-system-used
             (set 'last-coding-system-used coding-system-used))))
 
+      (tramp-flush-file-property v (file-name-directory localname))
+      (tramp-flush-file-property v localname)
+
       ;; We must protect `last-coding-system-used', now we have set it
       ;; to its correct value.
       (let (last-coding-system-used (need-chown t))
diff --git a/lisp/nxml/nxml-mode.el b/lisp/nxml/nxml-mode.el
index 8bcde7a3a22..8919d920c9d 100644
--- a/lisp/nxml/nxml-mode.el
+++ b/lisp/nxml/nxml-mode.el
@@ -50,8 +50,7 @@
 
 (defgroup nxml-faces nil
   "Faces for XML syntax highlighting."
-  :group 'nxml
-  :group 'font-lock-faces)
+  :group 'nxml)
 
 (defcustom nxml-char-ref-display-glyph-flag t
   "*Non-nil means display glyph following character reference.
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 88e56354e25..7ce303b5add 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-15  Chong Yidong  <cyd@stupidchicken.com>
+
+        * org-freemind.el (org-freemind-from-org-mode-node)
+        (org-freemind-from-org-mode, )
+        (org-freemind-from-org-sparse-tree, org-freemind-to-org-mode):
+        Pass arg to called-interactively-p.
+
 2010-01-14  Juanma Barranquero  <lekktu@gmail.com>
 
         * org-protocol.el (org-protocol-flatten-greedy, org-protocol-flatten):
diff --git a/lisp/org/org-freemind.el b/lisp/org/org-freemind.el
index 5e0480fe224..ce923502ae9 100644
--- a/lisp/org/org-freemind.el
+++ b/lisp/org/org-freemind.el
@@ -825,13 +825,13 @@ Otherwise give an error say the file exists."
                                      ".mm"))
             (mm-file (read-file-name "Output FreeMind file: " nil nil nil default-mm-file)))
        (list line mm-file))))
-  (when (org-freemind-check-overwrite mm-file (called-interactively-p))
+  (when (org-freemind-check-overwrite mm-file (called-interactively-p 'any))
     (let ((org-buffer (current-buffer))
           (mm-buffer (find-file-noselect mm-file)))
       (org-freemind-write-mm-buffer org-buffer mm-buffer node-line)
       (with-current-buffer mm-buffer
         (basic-save-buffer)
-        (when (called-interactively-p)
+        (when (called-interactively-p 'any)
           (switch-to-buffer-other-window mm-buffer)
           (when (y-or-n-p "Show in FreeMind? ")
             (org-freemind-show buffer-file-name)))))))
@@ -849,13 +849,13 @@ Otherwise give an error say the file exists."
                             ".mm"))
           (mm-file (read-file-name "Output FreeMind file: " nil nil nil default-mm-file)))
      (list org-file mm-file)))
-  (when (org-freemind-check-overwrite mm-file (called-interactively-p))
+  (when (org-freemind-check-overwrite mm-file (called-interactively-p 'any))
     (let ((org-buffer (if org-file (find-file-noselect org-file) (current-buffer)))
           (mm-buffer (find-file-noselect mm-file)))
       (org-freemind-write-mm-buffer org-buffer mm-buffer nil)
       (with-current-buffer mm-buffer
         (basic-save-buffer)
-        (when (called-interactively-p)
+        (when (called-interactively-p 'any)
           (switch-to-buffer-other-window mm-buffer)
           (when (y-or-n-p "Show in FreeMind? ")
             (org-freemind-show buffer-file-name)))))))
@@ -872,7 +872,7 @@ Otherwise give an error say the file exists."
                             "-sparse.mm"))
           (mm-file (read-file-name "Output FreeMind file: " nil nil nil default-mm-file)))
      (list (current-buffer) mm-file)))
-  (when (org-freemind-check-overwrite mm-file (called-interactively-p))
+  (when (org-freemind-check-overwrite mm-file (called-interactively-p 'any))
     (let (org-buffer
           (mm-buffer (find-file-noselect mm-file)))
       (save-window-excursion
@@ -881,7 +881,7 @@ Otherwise give an error say the file exists."
       (org-freemind-write-mm-buffer org-buffer mm-buffer nil)
       (with-current-buffer mm-buffer
         (basic-save-buffer)
-        (when (called-interactively-p)
+        (when (called-interactively-p 'any)
           (switch-to-buffer-other-window mm-buffer)
           (when (y-or-n-p "Show in FreeMind? ")
             (org-freemind-show buffer-file-name)))))))
@@ -1108,7 +1108,7 @@ PATH should be a list of steps, where each step has the form
             (default-org-file (concat (file-name-nondirectory mm-file) ".org"))
             (org-file (read-file-name "Output org-mode file: " nil nil nil default-org-file)))
        (list mm-file org-file))))
-  (when (org-freemind-check-overwrite org-file (called-interactively-p))
+  (when (org-freemind-check-overwrite org-file (called-interactively-p 'any))
     (let ((mm-buffer (find-file-noselect mm-file))
           (org-buffer (find-file-noselect org-file)))
       (with-current-buffer mm-buffer
diff --git a/lisp/simple.el b/lisp/simple.el
index 4e9ffdc9740..30498ea2704 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2806,7 +2806,7 @@ ring directly.")
   "The tail of the kill ring whose car is the last thing yanked.")
 
 (defcustom save-interprogram-paste-before-kill nil
-  "Save the paste strings into `kill-ring' before replacing it with emacs strings.
+  "Save clipboard strings into kill ring before replacing them.
 When one selects something in another program to paste it into Emacs,
 but kills something in Emacs before actually pasting it,
 this selection is gone unless this variable is non-nil,
diff --git a/lisp/textmodes/flyspell.el b/lisp/textmodes/flyspell.el
index 612f83123ba..ee7a52a1093 100644
--- a/lisp/textmodes/flyspell.el
+++ b/lisp/textmodes/flyspell.el
@@ -1155,10 +1155,15 @@ than preceding) word when the cursor is not over a word."
                               nil)
                              (t
                               (setq flyspell-word-cache-result nil)
-                              ;; incorrect highlight the location
+                              ;; Highlight the location as incorrect,
+                              ;; including offset specified in POSS.
                               (if flyspell-highlight-flag
                                   (flyspell-highlight-incorrect-region
-                                   start end poss)
+                                   (if (and (consp poss)
+                                            (integerp (nth 1 poss)))
+                                       (+ start (nth 1 poss) -1)
+                                     start)
+                                   end poss)
                                 (flyspell-notify-misspell word poss))
                               nil))))
               ;; return to original location