Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org

28 files changed, 291 insertions, 118 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f6213bbd186..7ca8751216f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,72 @@
+2012-04-14  Kim F. Storm  <storm@cua.dk>
+
+        * emulation/cua-base.el (cua-exchange-point-and-mark): Just call
+        exchange-point-and-mark if cua-enable-cua-keys is nil (Bug#11191).
+
+2012-04-14  Chong Yidong  <cyd@gnu.org>
+
+        * custom.el (custom-theme-set-variables): Doc fix.
+
+2012-04-14  Glenn Morris  <rgm@gnu.org>
+
+        * international/mule.el (set-auto-coding-for-load): Doc fix.
+
+2012-04-14  Alan Mackenzie  <acm@muc.de>
+
+        * progmodes/cc-menus.el (cc-imenu-objc-generic-expression): Make
+        imenu work again for Objective C Mode.  Correct the *-index values,
+        these having been disturbed by a previous change in 2011-08.
+
+        * progmodes/cc-engine.el (c-before-change-check-<>-operators):
+        Correct two search limits.
+
+2012-04-14  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * startup.el (command-line-1): Inhibit splash from daemon (bug#10996).
+
+2012-04-14  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * international/characters.el: Fix sorting.
+
+2012-04-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * international/characters.el: Add more missing Latin case pairs.
+
+2012-04-14  Glenn Morris  <rgm@gnu.org>
+
+        * files.el (dir-locals-set-class-variables): Doc fix.
+
+2012-04-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * international/characters.el: Add set-case-syntax-pair call for
+        LATIN CAPITAL LETTER Y WITH DIAERESIS RET and its lower-case
+        counterpart.  (Bug#11209)
+
+        * simple.el (shell-command-on-region): Doc fix.  (Bug#11208)
+
+2012-04-14  Glenn Morris  <rgm@gnu.org>
+
+        * calendar/holidays.el (calendar-check-holidays): Doc fix.
+
+2012-04-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * textmodes/ispell.el (ispell-dictionary-base-alist):
+        Add data for Hebrew.
+
+2012-04-14  Chong Yidong  <cyd@gnu.org>
+
+        * net/rcirc.el (rcirc-cmd-quit):
+        Revert 2012-03-18 change (Bug#11192).
+
+2012-04-14  Glenn Morris  <rgm@gnu.org>
+
+        * pcmpl-rpm.el (pcomplete/rpm): Handle -qf.
+
+2012-04-14  Eli Zaretskii  <eliz@gnu.org>
+
+        * minibuffer.el (completion-in-region-mode-map):
+        Bind completion-help-at-point to M-? rather than ?.  (Bug#11182)
+
 2012-04-13  Vivek Dasmohapatra  <vivek@etla.org>
 
         * hexl.el (hexl-insert-char): Make display sizes other than 16 work.
diff --git a/lisp/calendar/holidays.el b/lisp/calendar/holidays.el
index 37f511f7990..9edd353b889 100644
--- a/lisp/calendar/holidays.el
+++ b/lisp/calendar/holidays.el
@@ -634,7 +634,7 @@ The optional LABEL is used to label the buffer created."
   "Check the list of holidays for any that occur on DATE.
 DATE is a list (month day year).  This function considers the
 holidays from the list `calendar-holidays', and returns a list of
-strings describing those holidays that apply on DATE."
+strings describing those holidays that apply on DATE, or nil if none do."
   (let ((displayed-month (calendar-extract-month date))
         (displayed-year (calendar-extract-year date))
         holiday-list)
diff --git a/lisp/custom.el b/lisp/custom.el
index d8909f8be92..611d5688f30 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -936,16 +936,21 @@ Each of the arguments in ARGS should be a list of this form:
 
   (SYMBOL EXP [NOW [REQUEST [COMMENT]]])
 
-This stores EXP (without evaluating it) as the saved value for SYMBOL.
-If NOW is present and non-nil, then also evaluate EXP and set
-the default value for the SYMBOL to the value of EXP.
+SYMBOL is the variable name, and EXP is an expression which
+evaluates to the customized value.  EXP will also be stored,
+without evaluating it, in SYMBOL's `saved-value' property, so
+that it can be restored via the Customize interface.  It is also
+added to the alist in SYMBOL's `theme-value' property \(by
+calling `custom-push-theme').
 
-REQUEST is a list of features we must require in order to
-handle SYMBOL properly.
-COMMENT is a comment string about SYMBOL.
+NOW, if present and non-nil, means to install the variable's
+value directly now, even if its `defcustom' declaration has not
+been executed.  This is for internal use only.
+
+REQUEST is a list of features to `require' (which are loaded
+prior to evaluating EXP).
 
-EXP itself is saved unevaluated as SYMBOL property `saved-value' and
-in SYMBOL's list property `theme-value' \(using `custom-push-theme')."
+COMMENT is a comment string about SYMBOL."
   (custom-check-theme theme)
 
   ;; Process all the needed autoloads before anything else, so that the
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 22d80944e5c..ba6127b4cba 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1002,15 +1002,21 @@ behavior, see `cua-paste-pop-rotate-temporarily'."
     (setq this-command 'cua-paste-pop))))
 
 (defun cua-exchange-point-and-mark (arg)
-  "Exchanges point and mark, but don't activate the mark.
-Activates the mark if a prefix argument is given."
+  "Exchange point and mark.
+Don't activate the mark if `cua-enable-cua-keys' is non-nil.
+Otherwise, just activate the mark if a prefix ARG is given.
+
+See also `exchange-point-and-mark'."
   (interactive "P")
-  (if arg
-      (setq mark-active t)
-    (let (mark-active)
-      (exchange-point-and-mark)
-      (if cua--rectangle
-          (cua--rectangle-corner 0)))))
+  (cond ((null cua-enable-cua-keys)
+         (exchange-point-and-mark arg))
+        (arg
+         (setq mark-active t))
+        (t
+         (let (mark-active)
+           (exchange-point-and-mark)
+           (if cua--rectangle
+               (cua--rectangle-corner 0))))))
 
 ;; Typed text that replaced the highlighted region.
 (defvar cua--repeat-replace-text nil)
diff --git a/lisp/files.el b/lisp/files.el
index e623bc66080..fb4662e7ea8 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -3523,7 +3523,7 @@ LIST is a list of the form accepted by the function.
 When a file is visited, the file's class is found.  A directory
 may be assigned a class using `dir-locals-set-directory-class'.
 Then variables are set in the file's buffer according to the
-class' LIST.  The list is processed in order.
+VARIABLES list of the class.  The list is processed in order.
 
 * If the element is of the form (MAJOR-MODE . ALIST), and the
   buffer's major mode is derived from MAJOR-MODE (as determined
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index ef0f1c5c852..23e800e0f3f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,19 @@
+2012-04-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * gnus-msg.el (gnus-inews-insert-gcc): Don't do the alist stuff when we
+        don't have a current group.
+
+        * gnus-msg.el (gnus-inews-insert-gcc): Protect against when we don't
+        have a group name.
+
+        * gnus-art.el (article-wash-html): Ensure that we insert the HTML into
+        a multibyte buffer (bug#7410).
+        (article-wash-html): Parse the original article buffer to get the
+        unencoded data (bug#7410).
+
+        * gnus-start.el (gnus-read-newsrc-el-file): Protect against broken
+        .newsrc.el files.
+
 2012-03-22  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * auth-source.el (auth-source-netrc-create): Quote tokens that contain
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 048f8956567..b04615dc5a9 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -2754,9 +2754,11 @@ If READ-CHARSET, ask for a coding system."
   (let ((handles nil)
         (buffer-read-only nil))
     (when (gnus-buffer-live-p gnus-original-article-buffer)
-      (setq handles (mm-dissect-buffer t t)))
+      (with-current-buffer gnus-original-article-buffer
+        (setq handles (mm-dissect-buffer t t))))
     (article-goto-body)
     (delete-region (point) (point-max))
+    (mm-enable-multibyte)
     (mm-inline-text-html handles)))
 
 (defvar gnus-article-browse-html-temp-list nil
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 500ace9e8ff..815bd9e44a6 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1664,17 +1664,19 @@ this is a reply."
            ((functionp var)
             ;; A function.
             (funcall var group))
-           (t
+           (group
             ;; An alist of regexps/functions/forms.
             (while (and var
                         (not
                          (setq result
                                (cond
-                                ((stringp (caar var))
+                                ((and group
+                                      (stringp (caar var)))
                                  ;; Regexp.
                                  (when (string-match (caar var) group)
                                    (cdar var)))
-                                ((functionp (car var))
+                                ((and group
+                                      (functionp (car var)))
                                  ;; Function.
                                  (funcall (car var) group))
                                 (t
diff --git a/lisp/gnus/gnus-start.el b/lisp/gnus/gnus-start.el
index bb7dd76d590..f025960c348 100644
--- a/lisp/gnus/gnus-start.el
+++ b/lisp/gnus/gnus-start.el
@@ -2442,7 +2442,9 @@ If FORCE is non-nil, the .newsrc file is read."
         (when gnus-newsrc-assoc
           (setq gnus-newsrc-alist gnus-newsrc-assoc))))
     (dolist (elem gnus-newsrc-alist)
-      (setcar elem (mm-string-as-unibyte (car elem))))
+      ;; Protect against broken .newsrc.el files.
+      (when (car elem)
+        (setcar elem (mm-string-as-unibyte (car elem)))))
     (gnus-make-hashtable-from-newsrc-alist)
     (when (file-newer-than-file-p file ding-file)
       ;; Old format quick file
diff --git a/lisp/international/characters.el b/lisp/international/characters.el
index 1739b1f9ea3..c75ca8106ac 100644
--- a/lisp/international/characters.el
+++ b/lisp/international/characters.el
@@ -576,9 +576,7 @@ with L, LRE, or LRO Unicode bidi character type.")
           (set-case-syntax-pair from (1+ from) tbl)
           (setq from (+ from 2))))))
 
-  (set-case-syntax-pair #x178 #x0ff tbl)
-  (set-case-syntax-pair #x189 #x256 tbl)
-  (set-case-syntax-pair #x18A #x257 tbl)
+  (set-case-syntax-pair ?Ÿ ?ÿ tbl)
 
   ;; In some languages, such as Turkish, U+0049 LATIN CAPITAL LETTER I
   ;; and U+0131 LATIN SMALL LETTER DOTLESS I make a case pair, and so
@@ -594,6 +592,8 @@ with L, LRE, or LRO Unicode bidi character type.")
 
   (set-case-syntax-pair ?Ɓ ?ɓ tbl)
   (set-case-syntax-pair ?Ɔ ?ɔ tbl)
+  (set-case-syntax-pair ?Ɖ ?ɖ tbl)
+  (set-case-syntax-pair ?Ɗ ?ɗ tbl)
   (set-case-syntax-pair ?Ǝ ?ǝ tbl)
   (set-case-syntax-pair ?Ə ?ə tbl)
   (set-case-syntax-pair ?Ɛ ?ɛ tbl)
@@ -622,6 +622,12 @@ with L, LRE, or LRO Unicode bidi character type.")
   (set-case-syntax-pair ?Dz ?dz tbl)
   (set-case-syntax-pair ?Ƕ ?ƕ tbl)
   (set-case-syntax-pair ?Ƿ ?ƿ tbl)
+  (set-case-syntax-pair ?Ⱥ ?ⱥ tbl)
+  (set-case-syntax-pair ?Ƚ ?ƚ tbl)
+  (set-case-syntax-pair ?Ⱦ ?ⱦ tbl)
+  (set-case-syntax-pair ?Ƀ ?ƀ tbl)
+  (set-case-syntax-pair ?Ʉ ?ʉ tbl)
+  (set-case-syntax-pair ?Ʌ ?ʌ tbl)
 
   ;; Latin Extended Additional
   (modify-category-entry '(#x1e00 . #x1ef9) ?l)
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 7bf15009687..1f88df52fd4 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1754,8 +1754,9 @@ functions, so they won't be called at all."
   :type '(repeat function))
 
 (defvar set-auto-coding-for-load nil
-  "Non-nil means look for `load-coding' property instead of `coding'.
-This is used for loading and byte-compiling Emacs Lisp files.")
+  "Non-nil means respect a \"unibyte: t\" entry in file local variables.
+Emacs binds this variable to t when loading or byte-compiling Emacs Lisp
+files.")
 
 (defun auto-coding-alist-lookup (filename)
   "Return the coding system specified by `auto-coding-alist' for FILENAME."
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index eb731897212..c7e14ca481b 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -1506,7 +1506,7 @@ exit."
   (let ((map (make-sparse-keymap)))
     ;; FIXME: Only works if completion-in-region-mode was activated via
     ;; completion-at-point called directly.
-    (define-key map "?" 'completion-help-at-point)
+    (define-key map "\M-?" 'completion-help-at-point)
     (define-key map "\t" 'completion-at-point)
     map)
   "Keymap activated during `completion-in-region'.")
diff --git a/lisp/net/rcirc.el b/lisp/net/rcirc.el
index be4dee5d265..485af6e1b5e 100644
--- a/lisp/net/rcirc.el
+++ b/lisp/net/rcirc.el
@@ -2181,17 +2181,13 @@ CHANNELS is a comma- or space-separated string of channel names."
   (let ((channel (if (> (length channel) 0) channel target)))
     (rcirc-send-string process (concat "PART " channel " :" rcirc-id-string))))
 
-(defun-rcirc-command quit (reason all)
-  "Send a quit message to server with REASON.
-When called with prefix, quit all servers."
-  (interactive "sQuit reason: \nP")
-  (dolist (p (if all
-                 (rcirc-process-list)
-               (list process)))
-    (rcirc-send-string p (concat "QUIT :"
-                                 (if (not (zerop (length reason)))
-                                     reason
-                                   rcirc-id-string)))))
+(defun-rcirc-command quit (reason)
+  "Send a quit message to server with REASON."
+  (interactive "sQuit reason: ")
+  (rcirc-send-string process (concat "QUIT :"
+                                     (if (not (zerop (length reason)))
+                                         reason
+                                       rcirc-id-string))))
 
 (defun-rcirc-command nick (nick)
   "Change nick to NICK."
diff --git a/lisp/org/ChangeLog b/lisp/org/ChangeLog
index 618d5753a46..86f493a0a5b 100644
--- a/lisp/org/ChangeLog
+++ b/lisp/org/ChangeLog
@@ -1,3 +1,49 @@
+2012-04-14  Bastien Guerry  <bzg@gnu.org>
+
+        * org.el (org-point-at-end-of-empty-headline): Only try to match
+        `org-todo-line-regexp' when the value is non-nil, e.g. in non-org
+        modes.
+        (org-fontify-meta-lines-and-blocks-1): Prevent errors when trying
+        to fontify beyond (point-max).
+
+        * org-clock.el (org-clock-task-overrun-text)
+        (org-task-overrun, org-clock-get-clock-string)
+        (org-clock-update-mode-line)
+        (org-clock-notify-once-if-expired): Rename `org-task-overrun'
+        and `org-task-overrun-text' to `org-clock-task-overrun' and
+        `org-clock-task-overrun-text' respectively.
+        (org-task-overrun-text): New alias.
+
+        * org-table.el (org-table-eval-formula): Fix bug about handling
+        remote references as durations.
+        (org-table-get-range): Fix bug: make sure references to $0 are
+        correctly handled.
+
+        * org-pcomplete.el (pcomplete/org-mode/file-option):
+        Fix bug in `pcomplete/org-mode/file-option'.
+        (org-thing-at-point): Also match line options like LATEX_CLASS
+        when pcompleting from LATEX_.
+
+        * org-agenda.el (org-agenda-filter-make-matcher)
+        (org-agenda-filter-apply): Allow filtering entries out by
+        category.  Using `C-u <' from the agenda view will redisplay
+        the agenda without entries from categories of the current line.
+
+2012-04-14  Eric Schulte  <eric.schulte@gmx.com>
+
+        * ob-C.el (org-babel-C-ensure-main-wrap):
+        Add an explicit return to automatically generated main methods.
+
+2012-04-14  Matt Lundin  <mdl@imapmail.org>
+
+        * org.el (org-after-todo-state-change-hook):
+        Fix docstring to reflect name change of state to `org-state'.
+
+2012-04-14  Mike Sperber  <sperber@deinprogramm.de>  (tiny change)
+
+        * org-footnote.el (org-footnote-normalize):
+        Correctly pass keyword arguments to `org-export-preprocess-string'.
+
 2012-04-03  Bastien Guerry  <bzg@gnu.org>
 
         * org.el (org-todo): Fix regression: rename `state' to
diff --git a/lisp/org/ob-C.el b/lisp/org/ob-C.el
index 5f6c1cb1dd1..583510ac618 100644
--- a/lisp/org/ob-C.el
+++ b/lisp/org/ob-C.el
@@ -152,7 +152,7 @@ it's header arguments."
   "Wrap body in a \"main\" function call if none exists."
   (if (string-match "^[ \t]*[intvod]+[ \t\n\r]*main[ \t]*(.*)" body)
       body
-    (format "int main() {\n%s\n}\n" body)))
+    (format "int main() {\n%s\nreturn(0);\n}\n" body)))
 
 (defun org-babel-prep-session:C (session params)
   "This function does nothing as C is a compiled language with no
diff --git a/lisp/org/org-agenda.el b/lisp/org/org-agenda.el
index 324ddd27f9a..3bb0fc84897 100644
--- a/lisp/org/org-agenda.el
+++ b/lisp/org/org-agenda.el
@@ -6365,7 +6365,9 @@ to switch to narrowing."
     (dolist (x (delete-dups
                 (append (get 'org-agenda-category-filter
                              :preset-filter) org-agenda-category-filter)))
-      (setq f1 (list 'equal (substring x 1) 'cat))
+      (if (equal "-" (substring x 0 1))
+          (setq f1 (list 'not (list 'equal (substring x 1) 'cat)))
+        (setq f1 (list 'equal (substring x 1) 'cat)))
       (push f1 f))
     (cons 'and (nreverse f))))
 
@@ -6396,9 +6398,13 @@ If the line does not have an effort defined, return nil."
   (let (tags cat)
     (if (eq type 'tag)
         (setq org-agenda-tag-filter filter)
-      (setq org-agenda-category-filter filter
-            org-agenda-filtered-by-category t))
+      (setq org-agenda-category-filter filter))
     (setq org-agenda-filter-form (org-agenda-filter-make-matcher))
+    (if (and (eq type 'category)
+             (not (equal (substring (car filter) 0 1) "-")))
+        ;; Only set `org-agenda-filtered-by-category' to t
+        ;; when a unique category is used as the filter
+        (setq org-agenda-filtered-by-category t))
     (org-agenda-set-mode-name)
     (save-excursion
       (goto-char (point-min))
@@ -6412,7 +6418,7 @@ If the line does not have an effort defined, return nil."
               (beginning-of-line 2))
           (beginning-of-line 2))))
     (if (get-char-property (point) 'invisible)
-        (org-agenda-previous-line))))
+        (ignore-errors (org-agenda-previous-line)))))
 
 (defun org-agenda-filter-hide-line (type)
   (let (ov)
diff --git a/lisp/org/org-clock.el b/lisp/org/org-clock.el
index 7105bfe13dc..434f6a1d5f6 100644
--- a/lisp/org/org-clock.el
+++ b/lisp/org/org-clock.el
@@ -219,7 +219,8 @@ auto     Automatically, either `all', or `repeat' for repeating tasks"
           (const :tag "All task time" all)
           (const :tag "Automatically, `all' or since `repeat'" auto)))
 
-(defcustom org-task-overrun-text nil
+(defvaralias 'org-task-overrun-text 'org-clock-task-overrun-text)
+(defcustom org-clock-task-overrun-text nil
   "The extra modeline text that should indicate that the clock is overrun.
 The can be nil to indicate that instead of adding text, the clock time
 should get a different face (`org-mode-line-clock-overrun').
@@ -495,7 +496,7 @@ pointing to it."
         (insert (format "[%c] %-15s %s\n" i cat task))
         (cons i marker)))))
 
-(defvar org-task-overrun nil
+(defvar org-clock-task-overrun nil
   "Internal flag indicating if the clock has overrun the planned time.")
 (defvar org-clock-update-period 60
   "Number of seconds between mode line clock string updates.")
@@ -516,7 +517,7 @@ If not, show simply the clocked time like 01:50."
                (work-done-str
                 (org-propertize
                  (format org-time-clocksum-format h m)
-                 'face (if (and org-task-overrun (not org-task-overrun-text))
+                 'face (if (and org-clock-task-overrun (not org-clock-task-overrun-text))
                            'org-mode-line-clock-overrun 'org-mode-line-clock)))
                (effort-str (format org-time-clocksum-format effort-h effort-m))
                (clockstr (org-propertize
@@ -532,7 +533,7 @@ If not, show simply the clocked time like 01:50."
 (defun org-clock-update-mode-line ()
   (if org-clock-effort
       (org-clock-notify-once-if-expired)
-    (setq org-task-overrun nil))
+    (setq org-clock-task-overrun nil))
   (setq org-mode-line-string
         (org-propertize
          (let ((clock-string (org-clock-get-clock-string))
@@ -546,10 +547,10 @@ If not, show simply the clocked time like 01:50."
          'local-map org-clock-mode-line-map
          'mouse-face (if (featurep 'xemacs) 'highlight 'mode-line-highlight)
          ))
-  (if (and org-task-overrun org-task-overrun-text)
+  (if (and org-clock-task-overrun org-clock-task-overrun-text)
       (setq org-mode-line-string
             (concat (org-propertize
-                     org-task-overrun-text
+                     org-clock-task-overrun-text
                      'face 'org-mode-line-clock-overrun) org-mode-line-string)))
   (force-mode-line-update))
 
@@ -606,7 +607,7 @@ Notification is shown only once."
   (when (org-clocking-p)
     (let ((effort-in-minutes (org-duration-string-to-minutes org-clock-effort))
           (clocked-time (org-clock-get-clocked-time)))
-      (if (setq org-task-overrun
+      (if (setq org-clock-task-overrun
                 (if (or (null effort-in-minutes) (zerop effort-in-minutes))
                     nil
                   (>= clocked-time effort-in-minutes)))
diff --git a/lisp/org/org-footnote.el b/lisp/org/org-footnote.el
index 34fc31f39d6..9319e0813c0 100644
--- a/lisp/org/org-footnote.el
+++ b/lisp/org/org-footnote.el
@@ -704,7 +704,7 @@ Additional note on `org-footnote-insert-pos-for-preprocessor':
                                      (org-combine-plists
                                       export-props
                                       '(:todo-keywords t :tags t :priority t))))
-                                (org-export-preprocess-string def parameters))
+                                (apply #'org-export-preprocess-string def parameters))
                             def)
                           ;; Reference beginning position is a marker
                           ;; to preserve it during further buffer
diff --git a/lisp/org/org-pcomplete.el b/lisp/org/org-pcomplete.el
index 0ca8777878c..5950d8e26da 100644
--- a/lisp/org/org-pcomplete.el
+++ b/lisp/org/org-pcomplete.el
@@ -69,7 +69,7 @@ The return value is a string naming the thing at point."
         (re-search-backward "^[ \t]*#\\+\\([A-Z_]+\\):.*"
                             (line-beginning-position) t))
       (cons "file-option" (match-string-no-properties 1)))
-     ((string-match "\\`[ \t]*#\\+[a-zA-Z]*\\'" line-to-here)
+     ((string-match "\\`[ \t]*#\\+[a-zA-Z_]*\\'" line-to-here)
       (cons "file-option" nil))
      ((equal (char-before beg) ?\[)
       (cons "link" nil))
@@ -144,7 +144,7 @@ When completing for #+STARTUP, for example, this function returns
                               (if (string-match "^#\\+\\([A-Z_]+:?\\)" x)
                                   (match-string 1 x)))
                             (org-split-string (org-get-current-options) "\n"))
-                    org-additional-option-like-keywords)))))
+                    (copy-sequence org-additional-option-like-keywords))))))
    (substring pcomplete-stub 2)))
 
 (defvar org-startup-options)
diff --git a/lisp/org/org-special-blocks.el b/lisp/org/org-special-blocks.el
index 5bf8362357f..43b37c64016 100644
--- a/lisp/org/org-special-blocks.el
+++ b/lisp/org/org-special-blocks.el
@@ -80,17 +80,17 @@ seen.  This is run after a few special cases are taken care of."
 (add-hook 'org-export-latex-after-blockquotes-hook
           'org-special-blocks-convert-latex-special-cookies)
 
-(defvar org-special-blocks-line)
+(defvar line)
 (defun org-special-blocks-convert-html-special-cookies ()
   "Converts the special cookies into div blocks."
-  ;; Uses the dynamically-bound variable `org-special-blocks-line'.
-  (when (string-match "^ORG-\\(.*\\)-\\(START\\|END\\)$" org-special-blocks-line)
+  ;; Uses the dynamically-bound variable `line'.
+  (when (string-match "^ORG-\\(.*\\)-\\(START\\|END\\)$" line)
     (message "%s" (match-string 1))
-    (when (equal (match-string 2 org-special-blocks-line) "START")
+    (when (equal (match-string 2 line) "START")
       (org-close-par-maybe)
-      (insert "\n<div class=\"" (match-string 1 org-special-blocks-line) "\">")
+      (insert "\n<div class=\"" (match-string 1 line) "\">")
       (org-open-par))
-    (when (equal (match-string 2 org-special-blocks-line) "END")
+    (when (equal (match-string 2 line) "END")
       (org-close-par-maybe)
       (insert "\n</div>")
       (org-open-par))
diff --git a/lisp/org/org-table.el b/lisp/org/org-table.el
index ae12cee2abe..08981b57e49 100644
--- a/lisp/org/org-table.el
+++ b/lisp/org/org-table.el
@@ -2526,8 +2526,13 @@ not overwrite the stored one."
                 (replace-match
                  (save-match-data
                    (org-table-make-reference
-                    (org-table-get-remote-range
-                     (match-string 1 form) (match-string 2 form))
+                    (let ((rmtrng (org-table-get-remote-range
+                                   (match-string 1 form) (match-string 2 form))))
+                      (if duration
+                          (if (listp rmtrng)
+                              (mapcar (lambda(x) (org-table-time-string-to-seconds x)) rmtrng)
+                            (org-table-time-string-to-seconds rmtrng))
+                        rmtrng))
                     keep-empty numbers lispp))
                  t t form)))
         ;; Insert complex ranges
@@ -2663,8 +2668,8 @@ in the buffer and column1 and column2 are table column numbers."
 ;      (setq r2 (or r2 r1) c2 (or c2 c1))
       (if (not r1) (setq r1 thisline))
       (if (not r2) (setq r2 thisline))
-      (if (not c1) (setq c1 col))
-      (if (not c2) (setq c2 col))
+      (if (or (not c1) (= 0 c1)) (setq c1 col))
+      (if (or (not c2) (= 0 c2)) (setq c2 col))
       (if (and (not corners-only)
                (or (not rangep) (and (= r1 r2) (= c1 c2))))
           ;; just one field
diff --git a/lisp/org/org.el b/lisp/org/org.el
index 0f13223d0c1..c2cc2354439 100644
--- a/lisp/org/org.el
+++ b/lisp/org/org.el
@@ -6,7 +6,7 @@
 ;; Maintainer: Bastien Guerry <bzg at gnu dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
 ;; Homepage: http://orgmode.org
-;; Version: 7.8.08
+;; Version: 7.8.09
 ;;
 ;; This file is part of GNU Emacs.
 ;;
@@ -206,7 +206,7 @@ identifier."
 
 ;;; Version
 
-(defconst org-version "7.8.08"
+(defconst org-version "7.8.09"
   "The version number of the file org.el.")
 
 ;;;###autoload
@@ -2225,7 +2225,7 @@ property and include the word \"recursive\" into the value."
 (defcustom org-after-todo-state-change-hook nil
   "Hook which is run after the state of a TODO item was changed.
 The new state (a string with a TODO keyword, or nil) is available in the
-Lisp variable `state'."
+Lisp variable `org-state'."
   :group 'org-todo
   :type 'hook)
 
@@ -5427,7 +5427,8 @@ will be prompted for."
             (when (re-search-forward
                    (concat "^[ \t]*#\\+end" (match-string 4) "\\>.*")
                    nil t)  ;; on purpose, we look further than LIMIT
-              (setq end (match-end 0) end1 (1- (match-beginning 0)))
+              (setq end (min (point-max) (match-end 0))
+                    end1 (min (point-max) (1- (match-beginning 0))))
               (setq block-end (match-beginning 0))
               (when quoting
                 (remove-text-properties beg end
@@ -5455,11 +5456,12 @@ will be prompted for."
                                      '(face org-block))) ; end of source block
                ((not org-fontify-quote-and-verse-blocks))
                ((string= block-type "quote")
-                (add-text-properties beg1 (1+ end1) '(face org-quote)))
+                (add-text-properties beg1 (min (point-max) (1+ end1)) '(face org-quote)))
                ((string= block-type "verse")
-                (add-text-properties beg1 (1+ end1) '(face org-verse))))
+                (add-text-properties beg1 (min (point-max) (1+ end1)) '(face org-verse))))
               (add-text-properties beg beg1 '(face org-block-begin-line))
-              (add-text-properties (1+ end) (1+ end1) '(face org-block-end-line))
+              (add-text-properties (min (point-max) (1+ end)) (min (point-max) (1+ end1))
+                                   '(face org-block-end-line))
               t))
            ((member dc1 '("title:" "author:" "email:" "date:"))
             (add-text-properties
@@ -5475,7 +5477,7 @@ will be prompted for."
            ((not (member (char-after beg) '(?\  ?\t)))
             ;; just any other in-buffer setting, but not indented
             (add-text-properties
-             beg (1+ (match-end 0))
+             beg (match-end 0)
              '(font-lock-fontified t face org-meta-line))
             t)
            ((or (member dc1 '("begin:" "end:" "caption:" "label:"
@@ -13422,8 +13424,7 @@ With prefix ARG, realign all tags in headings in the current buffer."
         ;; Get a new set of tags from the user
         (save-excursion
           (setq table (append org-tag-persistent-alist
-                              org-tag-alist
-                              (org-get-buffer-tags)
+                              (or org-tag-alist (org-get-buffer-tags))
                               (and
                                org-complete-tags-always-offer-all-agenda-tags
                                (org-global-tags-completion-table
@@ -13725,11 +13726,9 @@ Returns the new tags string, or nil to not change the current settings."
                   (condition-case nil
                       (setq tg (org-icompleting-read
                                 "Tag: "
-                                (delete-dups
-                                 (append (or buffer-tags
-                                             (with-current-buffer buf
-                                               (mapcar 'car (org-get-buffer-tags))))
-                                         (mapcar 'car table)))))
+                                (or buffer-tags
+                                    (with-current-buffer buf
+                                      (org-get-buffer-tags)))))
                     (quit (setq tg "")))
                   (when (string-match "\\S-" tg)
                     (add-to-list 'buffer-tags (list tg))
@@ -20775,11 +20774,12 @@ This version does not only check the character property, but also
 If the heading only contains a TODO keyword, it is still still considered
 empty."
   (and (looking-at "[ \t]*$")
-       (save-excursion
-         (beginning-of-line 1)
-         (let ((case-fold-search nil))
-           (looking-at org-todo-line-regexp)))
-       (string= (match-string 3) "")))
+       (when org-todo-line-regexp
+         (save-excursion
+           (beginning-of-line 1)
+           (let ((case-fold-search nil))
+             (looking-at org-todo-line-regexp)
+             (string= (match-string 3) ""))))))
 
 (defun org-at-heading-or-item-p ()
   (or (org-at-heading-p) (org-at-item-p)))
diff --git a/lisp/pcmpl-rpm.el b/lisp/pcmpl-rpm.el
index 8019b876562..f28469d791b 100644
--- a/lisp/pcmpl-rpm.el
+++ b/lisp/pcmpl-rpm.el
@@ -1,6 +1,6 @@
 ;;; pcmpl-rpm.el --- functions for dealing with rpm completions
 
-;; Copyright (C) 1999-2012  Free Software Foundation, Inc.
+;; Copyright (C) 1999-2012 Free Software Foundation, Inc.
 
 ;; Package: pcomplete
 
@@ -29,6 +29,13 @@
 
 ;; Functions:
 
+;; FIXME rpm -qa can be slow, so:
+;; Adding --nodigest --nosignature is MUCH faster.
+;; (Probably need to test --help for those options though.)
+;; Consider caching the result (cf woman).
+;; Consider printing an explanatory message before running -qa.
+;;
+;; Seems pointless for this to be a defsubst.
 (defsubst pcmpl-rpm-packages ()
   (split-string (pcomplete-process-result "rpm" "-q" "-a")))
 
@@ -92,6 +99,7 @@
                '("--changelog"
                  "--dbpath"
                  "--dump"
+                 "--file"
                  "--ftpport"            ;nyi for the next four
                  "--ftpproxy"
                  "--httpport"
@@ -112,6 +120,8 @@
                 (pcomplete-here*))
                ((pcomplete-test "--rcfile")
                 (pcomplete-here* (pcomplete-entries)))
+               ((pcomplete-test "--file")
+                (pcomplete-here* (pcomplete-entries)))
                ((pcomplete-test "--root")
                 (pcomplete-here* (pcomplete-dirs)))
                ((pcomplete-test "--scripts")
@@ -129,7 +139,9 @@
               (pcomplete-opt "af.p(pcmpl-rpm-files)ilsdcvR")
             (if (pcomplete-test "-[^-]*p" 'first 1)
                 (pcomplete-here (pcmpl-rpm-files))
-              (pcomplete-here (pcmpl-rpm-packages))))))
+              (if (pcomplete-test "-[^-]*f" 'first 1)
+                  (pcomplete-here* (pcomplete-entries))
+                (pcomplete-here (pcmpl-rpm-packages)))))))
        ((pcomplete-test "--pipe")
         (pcomplete-here* (funcall pcomplete-command-completion-function)))
        ((pcomplete-test "--rmsource")
diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el
index cf38001c123..65e28c11e21 100644
--- a/lisp/progmodes/cc-engine.el
+++ b/lisp/progmodes/cc-engine.el
@@ -5382,7 +5382,7 @@ comment at the start of cc-engine.el for more info."
           new-beg new-end need-new-beg need-new-end)
       ;; Locate the barrier before the changed region
       (goto-char  (if beg-lit-limits (car beg-lit-limits) beg))
-      (c-syntactic-skip-backward "^;{}" (max (- beg 2048) (point-min)))
+      (c-syntactic-skip-backward "^;{}" (c-determine-limit 512))
       (setq new-beg (point))
 
       ;; Remove the syntax-table properties from each pertinent <...> pair.
@@ -5393,8 +5393,7 @@ comment at the start of cc-engine.el for more info."
 
       ;; Locate the barrier after END.
       (goto-char (if end-lit-limits (cdr end-lit-limits) end))
-      (c-syntactic-re-search-forward "[;{}]"
-                                     (min (+ end 2048) (point-max)) 'end)
+      (c-syntactic-re-search-forward "[;{}]" (c-determine-+ve-limit 512) 'end)
       (setq new-end (point))
 
       ;; Remove syntax-table properties from the remaining pertinent <...>
diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index f57fcbff5ca..a53d65f6307 100644
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -63,6 +63,20 @@ For example:
 
 A sample value might look like: `\\(_P\\|_PROTO\\)'.")
 
+;;                        *Warning for cc-mode developers*
+;;
+;; `cc-imenu-objc-generic-expression' elements depend on
+;; `cc-imenu-c++-generic-expression'. So if you change this
+;; expression, you need to change following variables,
+;; `cc-imenu-objc-generic-expression-*-index',
+;; too. `cc-imenu-objc-function' uses these *-index variables, in
+;; order to know where the each regexp *group \\(foobar\\)* elements
+;; are started.
+;;
+;; *-index variables are initialized during `cc-imenu-objc-generic-expression'
+;; being initialized.
+;;
+
 (defvar cc-imenu-c++-generic-expression
   `(
     ;; Try to match ::operator definitions first. Otherwise `X::operator new ()'
@@ -187,23 +201,8 @@ A sample value might look like: `\\(_P\\|_PROTO\\)'.")
                ")"
                "[.," c-alnum " \t\n\r]*"
                "{"
-               )) 1))
-  "Imenu generic expression for Java mode.  See
-`imenu-generic-expression'.")
-
-;;                        *Warning for cc-mode developers*
-;;
-;; `cc-imenu-objc-generic-expression' elements depend on
-;; `cc-imenu-c++-generic-expression'. So if you change this
-;; expression, you need to change following variables,
-;; `cc-imenu-objc-generic-expression-*-index',
-;; too. `cc-imenu-objc-function' uses these *-index variables, in
-;; order to know where the each regexp *group \\(foobar\\)* elements
-;; are started.
-;;
-;; *-index variables are initialized during `cc-imenu-objc-generic-expression'
-;; being initialized.
-;;
+               )) 1))
+  "Imenu generic expression for Java mode.  See `imenu-generic-expression'.")
 
 ;; Internal variables
 (defvar cc-imenu-objc-generic-expression-noreturn-index nil)
@@ -224,7 +223,7 @@ A sample value might look like: `\\(_P\\|_PROTO\\)'.")
    "\\|"
    ;; > General function name regexp
    ;; Pick a token by  (match-string 3)
-   (car (cdr (nth 2 cc-imenu-c++-generic-expression))) ; -> index += 5
+   (car (cdr (nth 2 cc-imenu-c++-generic-expression))) ; -> index += 6
    (prog2 (setq cc-imenu-objc-generic-expression-general-func-index 3) "")
    ;; > Special case for definitions using phony prototype macros like:
    ;; > `int main _PROTO( (int argc,char *argv[]) )'.
@@ -233,11 +232,11 @@ A sample value might look like: `\\(_P\\|_PROTO\\)'.")
        (concat
         "\\|"
         (car (cdr (nth 3 cc-imenu-c++-generic-expression))) ; -> index += 1
-        (prog2 (setq cc-imenu-objc-generic-expression-objc-base-index 9) "")
+        (prog2 (setq cc-imenu-objc-generic-expression-objc-base-index 10) "")
         )
-     (prog2 (setq cc-imenu-objc-generic-expression-objc-base-index 8) "")
+     (prog2 (setq cc-imenu-objc-generic-expression-objc-base-index 9) "")
      "")                                ; -> index += 0
-   (prog2 (setq cc-imenu-objc-generic-expression-proto-index 8) "")
+   (prog2 (setq cc-imenu-objc-generic-expression-proto-index 9) "")
    ;;
    ;; For Objective-C
    ;; Pick a token by (match-string 8 or 9)
diff --git a/lisp/simple.el b/lisp/simple.el
index 54005ebd2b3..b8422f9923a 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2464,9 +2464,9 @@ COMMAND.
 To specify a coding system for converting non-ASCII characters
 in the input and output to the shell command, use \\[universal-coding-system-argument]
 before this command.  By default, the input (from the current buffer)
-is encoded in the same coding system that will be used to save the file,
-`buffer-file-coding-system'.  If the output is going to replace the region,
-then it is decoded from that same coding system.
+is encoded using coding-system specified by `process-coding-system-alist',
+falling back to `default-process-coding-system' if no match for COMMAND
+is found in `process-coding-system-alist'.
 
 The noninteractive arguments are START, END, COMMAND,
 OUTPUT-BUFFER, REPLACE, ERROR-BUFFER, and DISPLAY-ERROR-BUFFER.
diff --git a/lisp/startup.el b/lisp/startup.el
index b5dae92517a..4a8af55af2f 100644
--- a/lisp/startup.el
+++ b/lisp/startup.el
@@ -2316,6 +2316,7 @@ A fancy display is used on graphic displays, normal otherwise."
     (if (or inhibit-startup-screen
             initial-buffer-choice
             noninteractive
+            (daemonp)
             inhibit-x-resources)
 
         ;; Not displaying a startup screen.  If 3 or more files
@@ -2358,9 +2359,7 @@ A fancy display is used on graphic displays, normal otherwise."
       ;; (with-no-warnings
       ;;        (setq menubar-bindings-done t))
 
-      (if (> file-count 0)
-          (display-startup-screen t)
-        (display-startup-screen nil)))))
+      (display-startup-screen (> file-count 0)))))
 
 (defun command-line-normalize-file-name (file)
   "Collapse multiple slashes to one, to handle non-Emacs file names."
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index 74c32817734..37311b7337d 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -684,7 +684,8 @@ re-start Emacs."
     ("svenska"                          ; Swedish mode
      "[A-Za-z\345\344\366\351\340\374\350\346\370\347\305\304\326\311\300\334\310\306\330\307]"
      "[^A-Za-z\345\344\366\351\340\374\350\346\370\347\305\304\326\311\300\334\310\306\330\307]"
-     "[']" nil ("-C") "~list" iso-8859-1))
+     "[']" nil ("-C") "~list" iso-8859-1)
+    ("hebrew" "[\340\341\342\343\344\345\346\347\350\351\353\352\354\356\355\360\357\361\362\364\363\367\366\365\370\371\372]" "[^\340\341\342\343\344\345\346\347\350\351\353\352\354\356\355\360\357\361\362\364\363\367\366\365\370\371\372]" "" nil ("-B") nil cp1255))
   "Base value for `ispell-dictionary-alist'.")
 
 (defvar ispell-dictionary-alist nil