Merge from trunk.

21 files changed, 356 insertions, 97 deletions

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index f65c2e85461..31e4f791350 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-15  Christopher Schmidt  <christopher@ch.ristopher.com>
+
+        * tips.texi (Coding Conventions): Mention separation of package
+        descriptor and name of internal symbols by two hyphens.
+
 2013-04-13  Stephen Berman  <stephen.berman@gmx.net>
 
         * windows.texi (Splitting Windows): Change category of
diff --git a/doc/lispref/tips.texi b/doc/lispref/tips.texi
index 4c443da3af8..c40ae408f7f 100644
--- a/doc/lispref/tips.texi
+++ b/doc/lispref/tips.texi
@@ -51,13 +51,15 @@ don't postpone it.
 
 @item
 You should choose a short word to distinguish your program from other
-Lisp programs.  The names of all global variables, constants, and
-functions in your program should begin with that chosen prefix.
-Separate the prefix from the rest of the name with a hyphen, @samp{-}.
-This practice helps avoid name conflicts, since all global variables
-in Emacs Lisp share the same name space, and all functions share
-another name space@footnote{The benefits of a Common Lisp-style
-package system are considered not to outweigh the costs.}.
+Lisp programs.  The names of all global symbols in your program, that
+is the names of variables, constants, and functions, should begin with
+that chosen prefix.  Separate the prefix from the rest of the name
+with a hyphen, @samp{-}.  Use two hyphens if the symbol is not meant
+to be used by other packages.  This practice helps avoid name
+conflicts, since all global variables in Emacs Lisp share the same
+name space, and all functions share another name space@footnote{The
+benefits of a Common Lisp-style package system are considered not to
+outweigh the costs.}.
 
 Occasionally, for a command name intended for users to use, it is more
 convenient if some words come before the package's name prefix.  And
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index a5b2edbc26f..5e9840a86b7 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-16  Michael Albinus  <michael.albinus@gmx.de>
+
+        * tramp.texi (Frequently Asked Questions): Precise, how to define
+        an own ControlPath.
+
 2013-04-15  Michael Albinus  <michael.albinus@gmx.de>
 
         * tramp.texi (Frequently Asked Questions): New item for
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index 42a3156c1e9..4c3740f02f7 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -3139,6 +3139,28 @@ already an @command{ssh} connection to that host.  Further
 process on that host, will reuse that initial @command{ssh}
 connection.
 
+If your @command{ssh} version supports the @code{ControlPersist}
+option, you could customize the variable
+@code{tramp-ssh-controlmaster-options} to use your @code{ControlPath},
+for example:
+
+@lisp
+(setq tramp-ssh-controlmaster-options
+      (concat
+        "-o ControlPath=/tmp/ssh-ControlPath-%%r@@%%h:%%p "
+        "-o ControlMaster=auto -o ControlPersist=yes"))
+@end lisp
+
+Note, that "%r", "%h" and "%p" must be encoded as "%%r", "%%h" and
+"%%p", respectively.  The entries of @code{ControlPath},
+@code{ControlMaster} and @code{ControlPersist} can be removed from
+this setting, if they are configured properly in your
+@file{~/.ssh/config}:
+
+@lisp
+(setq tramp-ssh-controlmaster-options "")
+@end lisp
+
 
 @item
 File name completion does not work with @value{tramp}
diff --git a/etc/ChangeLog b/etc/ChangeLog
index 31d14b96d94..2b7534dc1e7 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2013-04-15  Christopher Schmidt  <christopher@ch.ristopher.com>
+
+        * NEWS: Mention separation of package descriptor and name of
+        internal symbols by two hyphens.
+
 2013-04-13  Stephen Berman  <stephen.berman@gmx.net>
 
         * NEWS: Mention fixing `split-window' to be non-interactive.
diff --git a/etc/NEWS b/etc/NEWS
index 1e072afaaf1..0830a7be469 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -409,6 +409,12 @@ used in place of the 9th element of `file-attributes'.
 `preserve-extended-attributes' as it now handles both SELinux context
 and ACL entries.
 
+** Changes to the Emacs Lisp Coding Conventions in Emacs 24.4
+
+*** The package descriptor and name of global variables, constants,
+and functions should be separated by two hypens if the symbol is not
+meant to be used by other packages.
+
 
 * Changes in Emacs 24.4 on Non-Free Operating Systems
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2231d96a757..f62dff32008 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,65 @@
+2013-04-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * minibuffer.el (completion--twq-all):
+        * term/ns-win.el (ns-initialize-window-system):
+        * term/w32-win.el (w32-initialize-window-system): Silence byte-compiler.
+
+2013-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/nadvice.el (add-function): Default simple vars to their
+        global bindings.
+
+        * doc-view.el (doc-view-start-process): Handle url-handler directories.
+
+2013-04-15  Dmitry Gutov  <dgutov@yandex.ru>
+
+        * progmodes/ruby-mode.el (ruby-beginning-of-defun)
+        (ruby-end-of-defun, ruby-move-to-block): Bind `case-fold-search'
+        to nil.
+        (ruby-end-of-defun): Remove the unused arg, change the docstring
+        to reflect that this function is only used as the value of
+        `end-of-defun-function'.
+        (ruby-beginning-of-defun): Remove "top-level" from the docstring,
+        to reflect an earlier change that beginning/end-of-defun functions
+        jump between methods in a class definition, as well as top-level
+        functions.
+
+2013-04-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (minibuffer-complete): Don't just scroll
+        a *Completions* that's been iconified.
+        (minibuffer-force-complete): Make sure repetitions do cycle when going
+        through completion-in-region -> minibuffer-complete.
+
+2013-04-15  Alan Mackenzie  <acm@muc.de>
+
+        Correct the placement of c-cpp-delimiters when there're #s not at
+        col 0.
+
+        * progmodes/cc-langs.el (c-anchored-cpp-prefix): Reformulate and
+        place a submatch around the #.
+        * progmodes/cc-mode.el(c-neutralize-syntax-in-and-mark-CPP):
+        Start a search at BOL.  Put the c-cpp-delimiter category text propertiy
+        on the #, not BOL.
+
+2013-04-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/nadvice.el: Properly test names when adding advice.
+        (advice--member-p): New arg `name'.
+        (advice--add-function, advice-member-p): Use it (bug#14202).
+
+2013-04-15  Filipp Gunbin  <fgunbin@fastmail.fm>
+
+        Reformulate java imenu-generic-expression.
+        The old expression contained ill formed regexps.
+
+        * progmodes/cc-menus.el (cc-imenu-java-ellipsis-regexp)
+        (cc-imenu-java-type-spec-regexp, cc-imenu-java-comment-regexp)
+        (cc-imenu-java-method-arg-regexp): New defconsts.
+        (cc-imenu-java-build-type-args-regex): New defun.
+        (cc-imenu-java-generic-expression): Fix, to remove "ambiguous"
+        handling of spaces in the regexp.
+
 2013-03-15  Agustín Martín Domingo  <agustin.martin@hispalinux.es>
 
         * textmodes/ispell.el (ispell-command-loop): Remove
@@ -150,7 +212,7 @@
         * whitespace.el (whitespace-color-on, whitespace-color-off):
         Only call `font-lock-fontify-buffer' when `font-lock-mode' is on.
 
-2013-04-05  Jacek Chrząszcz  <chrzaszcz@mimuw.edu.pl> (tiny change)
+2013-04-05  Jacek Chrząszcz  <chrzaszcz@mimuw.edu.pl>  (tiny change)
 
         * ispell.el (ispell-set-spellchecker-params):
         Really set `ispell-args' for all equivs.
@@ -327,7 +389,7 @@
 2013-03-27  Aidan Gauland  <aidalgol@no8wireless.co.nz>
 
         * eshell/em-unix.el: Move su and sudo to...
-        * eshell/em-tramp.el: ...Eshell tramp module
+        * eshell/em-tramp.el: ...Eshell tramp module.
 
 2013-03-26  Stefan Monnier  <monnier@iro.umontreal.ca>
 
@@ -1322,7 +1384,6 @@
         * emacs-lisp/eieio-opt.el (eieio-class-button, eieio-describe-generic)
         (eieio-browse-tree, eieio-browse): Use eieio--check-type.
 
-
 2013-02-18  Aidan Gauland  <aidalgol@no8wireless.co.nz>
 
         * eshell/em-cmpl.el: Correct "context-related help" keybinding in
@@ -1529,7 +1590,7 @@
         [scpc, rsyncc]: Remove methods.
         (top): Remove completion functions for "scpc", "rsyncc", "ssh1_old"
         and "ssh2_old".
-        (tramp-do-copy-or-rename-file-out-of-band):  Change trace level.
+        (tramp-do-copy-or-rename-file-out-of-band): Change trace level.
         (tramp-maybe-open-connection): Reuse tmpfile for ControlPath.
 
 2013-02-13  Stefan Monnier  <monnier@iro.umontreal.ca>
@@ -1538,7 +1599,7 @@
 
 2013-02-13  Jambunathan K  <kjambunathan@gmail.com>
 
-        * icomplete.el (icomplete-hide-common-prefix):  New user option.
+        * icomplete.el (icomplete-hide-common-prefix): New user option.
         (icomplete-first-match): New face.
         (icomplete-completions): Correct handling of "complete but not
         unique" (Bug#12638).
@@ -1821,7 +1882,7 @@
         instead passing extra parameter HERE to several functions.
         Remove 'BOD strategy.
 
-2013-02-06  Nicolas Richard <theonewiththeevillook@yahoo.fr>  (tiny change)
+2013-02-06  Nicolas Richard  <theonewiththeevillook@yahoo.fr>  (tiny change)
 
         * emacs-lisp/package.el (describe-package-1): Tell what archive is
         used to install the package.
@@ -2213,7 +2274,7 @@
 
         * xml.el (xml-entity-or-char-ref-re): Fix regexp.
 
-2013-01-24  Aaron Ecay <aaronecay@gmail.com>  (tiny change)
+2013-01-24  Aaron Ecay  <aaronecay@gmail.com>  (tiny change)
 
         * paren.el (show-paren-function): Make sure to set 'priority and
         'face only if the overlay does exist.
@@ -2373,7 +2434,7 @@
 
 2013-01-15  Michael R. Mauger  <mmaug@yahoo.com>
 
-        * progmodes/sql.el: (sql-imenu-generic-expression):
+        * progmodes/sql.el (sql-imenu-generic-expression):
         (sql-mode-font-lock-object-name): Match schema qualified names.
         (sql-connect): Use string keys.
         (sql-product-interactive): Wait for interpreter prompt.
@@ -2992,7 +3053,7 @@
         * calc/calc-forms.el (math-parse-date): Try using
         `math-parse-iso-date' when it looks like it might be needed.
         Allow times of 24:00.
-        (math-parse-date-validate, math-parse-iso-date-validate):  Allow times
+        (math-parse-date-validate, math-parse-iso-date-validate): Allow times
         of 24:00.
 
 2012-12-30  Glenn Morris  <rgm@gnu.org>
@@ -3155,7 +3216,7 @@
         (tramp-adb-get-toolbox): New defun.  Check for remote shell
         implementation (BusyBox or Toolbox).
 
-2012-12-24  Constantin Kulikov <zxnotdead@gmail.com>  (tiny change)
+2012-12-24  Constantin Kulikov  <zxnotdead@gmail.com>  (tiny change)
 
         * startup.el (initial-buffer-choice): Allow function as value
         (Bug#13251).
@@ -3302,7 +3363,7 @@
         Add `file-acl' and `set-file-acl' handlers.
         (tramp-smb-handle-copy-file): Handle PRESERVE-EXTENDED-ATTRIBUTES.
 
-2012-12-17  Kelly Dean  <kellydeanch@yahoo.com> (tiny change)
+2012-12-17  Kelly Dean  <kellydeanch@yahoo.com>  (tiny change)
 
         * help-macro.el (make-help-screen): Instead of switch-to-buffer
         use pop-to-buffer with NORECORD argument t.  As buffer name, use
@@ -3503,7 +3564,7 @@
 
 2012-12-11  Jay Belanger  <jay.p.belanger@gmail.com>
 
-        * calc/calc.el (calc-standard-date-formats):  Add more date
+        * calc/calc.el (calc-standard-date-formats): Add more date
         formats.
         * calc/calc-forms.el (math-parse-iso-date): New function.
         (math-parse-date): Use `math-parse-iso-date' when appropriate.
@@ -3537,7 +3598,7 @@
 
         * subr.el (inotify-event-p, inotify-handle-event): New functions.
 
-2012-12-10  Dani Moncayo <dmoncayo@gmail.com>
+2012-12-10  Dani Moncayo  <dmoncayo@gmail.com>
 
         * simple.el (just-one-space): Doc fix.
 
@@ -4375,7 +4436,7 @@
 
 2012-11-19  Jay Belanger  <jay.p.belanger@gmail.com>
 
-        * calc/calc-forms.el (math-leap-year-p):  Fix formula for negative
+        * calc/calc-forms.el (math-leap-year-p): Fix formula for negative
         year numbers.
         (math-date-to-julian-dt): Adjust the initial approximation for the
         year to deal with the new definition of the DATE.
@@ -5460,7 +5521,7 @@
         Recover input meta mode when the new coding system doesn not use 8-bit.
         Supply TERMINAL arg to set-input-meta-mode.
 
-2012-10-17  Michael Heerdegen <michael_heerdegen@web.de>
+2012-10-17  Michael Heerdegen  <michael_heerdegen@web.de>
 
         * wdired.el (wdired-old-marks): New variable.
         (wdired-change-to-wdired-mode): Locally set wdired-old-marks.
diff --git a/lisp/doc-view.el b/lisp/doc-view.el
index 6217f5d0a3f..b1f399d5b73 100644
--- a/lisp/doc-view.el
+++ b/lisp/doc-view.el
@@ -881,8 +881,8 @@ Should be invoked when the cached images aren't up-to-date."
 (defun doc-view-start-process (name program args callback)
   ;; Make sure the process is started in an existing directory, (rather than
   ;; some file-name-handler-managed dir, for example).
-  (let* ((default-directory (if (file-readable-p default-directory)
-                                default-directory
+  (let* ((default-directory (or (unhandled-file-name-directory
+                                 default-directory)
                               (expand-file-name "~/")))
          (proc (apply 'start-process name doc-view-conversion-buffer
                       program args)))
diff --git a/lisp/emacs-lisp/nadvice.el b/lisp/emacs-lisp/nadvice.el
index 0632c7d2fc0..6c09ddfb8cf 100644
--- a/lisp/emacs-lisp/nadvice.el
+++ b/lisp/emacs-lisp/nadvice.el
@@ -158,11 +158,12 @@ WHERE is a symbol to select an entry in `advice--where-alist'."
     (advice--make-1 (nth 1 desc) (nth 2 desc)
                     function main props)))
 
-(defun advice--member-p (function definition)
+(defun advice--member-p (function name definition)
   (let ((found nil))
     (while (and (not found) (advice--p definition))
       (if (or (equal function (advice--car definition))
-              (equal function (cdr (assq 'name (advice--props definition)))))
+              (when name
+                (equal name (cdr (assq 'name (advice--props definition))))))
           (setq found t)
         (setq definition (advice--cdr definition))))
     found))
@@ -235,9 +236,8 @@ PROPS is an alist of additional properties, among which the following have
 a special meaning:
 - `name': a string or symbol.  It can be used to refer to this piece of advice.
 
-PLACE cannot be a simple variable.  Instead it should either be
-\(default-value 'VAR) or (local 'VAR) depending on whether FUNCTION
-should be applied to VAR buffer-locally or globally.
+If PLACE is a simple variable, only its global value will be affected.
+Use (local 'VAR) if you want to apply FUNCTION to VAR buffer-locally.
 
 If one of FUNCTION or OLDFUN is interactive, then the resulting function
 is also interactive.  There are 3 cases:
@@ -250,12 +250,13 @@ is also interactive.  There are 3 cases:
   (cond ((eq 'local (car-safe place))
          (setq place `(advice--buffer-local ,@(cdr place))))
         ((symbolp place)
-         (error "Use (default-value '%S) or (local '%S)" place place)))
+         (setq place `(default-value ',place))))
   `(advice--add-function ,where (gv-ref ,place) ,function ,props))
 
 ;;;###autoload
 (defun advice--add-function (where ref function props)
-  (unless (advice--member-p function (gv-deref ref))
+  (unless (advice--member-p function (cdr (assq 'name props))
+                            (gv-deref ref))
     (setf (gv-deref ref)
           (advice--make where function (gv-deref ref) props))))
 
@@ -396,7 +397,7 @@ of the piece of advice."
   "Return non-nil if ADVICE has been added to FUNCTION-NAME.
 Instead of ADVICE being the actual function, it can also be the `name'
 of the piece of advice."
-  (advice--member-p advice
+  (advice--member-p advice advice
                     (or (get function-name 'advice--pending)
                         (advice--strip-macro
                          (if (fboundp function-name)
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index cc7897accb6..144b6482b9d 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,10 @@
+2013-04-16  David Edmondson  <dme@dme.org>
+
+        Support <img src="data:...">.
+
+        * shr.el (shr-image-from-data): New function.
+        (shr-tag-img): Use it.
+
 2013-04-14  Andrew Cohen  <cohen@bu.edu>
 
         * nnir.el (nnir-request-set-mark): Make sure we are in the right
diff --git a/lisp/gnus/shr.el b/lisp/gnus/shr.el
index 5df5297ba8a..293ba2445e9 100644
--- a/lisp/gnus/shr.el
+++ b/lisp/gnus/shr.el
@@ -593,6 +593,17 @@ size, and full-buffer size."
                       (put-text-property start (point) type value))))))))))
     (kill-buffer image-buffer)))
 
+(defun shr-image-from-data (data)
+  "Return an image from the data: URI content DATA."
+  (when (string-match
+         "\\(\\([^/;,]+\\(/[^;,]+\\)?\\)\\(;[^;,]+\\)*\\)?,\\(.*\\)"
+         data)
+    (let ((param (match-string 4 data))
+          (payload (url-unhex-string (match-string 5 data))))
+      (when (string-match "^.*\\(;[ \t]*base64\\)$" param)
+        (setq payload (base64-decode-string payload)))
+      payload)))
+
 (defun shr-put-image (data alt &optional flags)
   "Put image DATA with a string ALT.  Return image."
   (if (display-graphic-p)
@@ -983,6 +994,12 @@ ones, in case fg and bg are nil."
           ;; Ignore zero-sized or single-pixel images.
           )
          ((and (not shr-inhibit-images)
+               (string-match "\\`data:" url))
+          (let ((image (shr-image-from-data (substring url (match-end 0)))))
+            (if image
+                (funcall shr-put-image-function image alt)
+              (insert alt))))
+         ((and (not shr-inhibit-images)
                (string-match "\\`cid:" url))
           (let ((url (substring url (match-end 0)))
                 image)
diff --git a/lisp/minibuffer.el b/lisp/minibuffer.el
index 016b16d0740..06ac7a91bea 100644
--- a/lisp/minibuffer.el
+++ b/lisp/minibuffer.el
@@ -525,7 +525,7 @@ for use at QPOS."
   (eq t (compare-strings s1 nil nil s2 nil nil 'ignore-case)))
 
 (defun completion--twq-all (string ustring completions boundary
-                                   unquote requote)
+                                   _unquote requote)
   (when completions
     (pcase-let*
         ((prefix
@@ -1043,7 +1043,8 @@ scroll the window of possible completions."
   (cond
    ;; If there's a fresh completion window with a live buffer,
    ;; and this command is repeated, scroll that window.
-   ((window-live-p minibuffer-scroll-window)
+   ((and (window-live-p minibuffer-scroll-window)
+         (eq t (frame-visible-p (window-frame minibuffer-scroll-window))))
     (let ((window minibuffer-scroll-window))
       (with-current-buffer (window-buffer window)
         (if (pos-visible-in-window-p (point-max) window)
@@ -1140,6 +1141,7 @@ scroll the window of possible completions."
   "Complete the minibuffer to an exact match.
 Repeated uses step through the possible completions."
   (interactive)
+  (setq minibuffer-scroll-window nil)
   ;; FIXME: Need to deal with the extra-size issue here as well.
   ;; FIXME: ~/src/emacs/t<M-TAB>/lisp/minibuffer.el completes to
   ;; ~/src/emacs/trunk/ and throws away lisp/minibuffer.el.
@@ -1162,6 +1164,7 @@ Repeated uses step through the possible completions."
       (completion--done (buffer-substring-no-properties start (point)) 'sole)
       ;; Set cycling after modifying the buffer since the flush hook resets it.
       (setq completion-cycling t)
+      (setq this-command 'completion-at-point) ;For minibuffer-complete.
       ;; If completing file names, (car all) may be a directory, so we'd now
       ;; have a new set of possible completions and might want to reset
       ;; completion-all-sorted-completions to nil, but we prefer not to,
diff --git a/lisp/progmodes/cc-langs.el b/lisp/progmodes/cc-langs.el
index ba9c42e4c89..af52ad53aad 100644
--- a/lisp/progmodes/cc-langs.el
+++ b/lisp/progmodes/cc-langs.el
@@ -812,8 +812,8 @@ Assumed to not contain any submatches or \\| operators."
 (c-lang-defconst c-anchored-cpp-prefix
   "Regexp matching the prefix of a cpp directive anchored to BOL,
 in the languages that have a macro preprocessor."
-  t (if (c-lang-const c-opt-cpp-prefix)
-        (concat "^" (c-lang-const c-opt-cpp-prefix))))
+  t "^\\s *\\(#\\)\\s *"
+  (java awk) nil)
 (c-lang-defvar c-anchored-cpp-prefix (c-lang-const c-anchored-cpp-prefix))
 
 (c-lang-defconst c-opt-cpp-start
diff --git a/lisp/progmodes/cc-menus.el b/lisp/progmodes/cc-menus.el
index a06eaf566d8..067a4df13dd 100644
--- a/lisp/progmodes/cc-menus.el
+++ b/lisp/progmodes/cc-menus.el
@@ -161,49 +161,132 @@ A sample value might look like: `\\(_P\\|_PROTO\\)'.")
   cc-imenu-c++-generic-expression
   "Imenu generic expression for C mode.  See `imenu-generic-expression'.")
 
-(defvar cc-imenu-java-generic-expression
+
+;; Auxiliary regexps for Java try to match their trailing whitespace where
+;; appropriate, but _not_ starting whitespace.
+
+(defconst cc-imenu-java-ellipsis-regexp
+  (concat
+   "\\.\\{3\\}"
+   "[ \t\n\r]*"))
+
+(defun cc-imenu-java-build-type-args-regex (depth)
+  "Builds regexp for type arguments list with DEPTH allowed
+nested angle brackets constructs."
+  (if (> depth 0)
+      (concat "<"
+                "[][.," c-alnum "_? \t\n\r]+"
+                (if (> depth 1)
+                    "\\(")
+                (cc-imenu-java-build-type-args-regex (1- depth))
+                (if (> depth 1)
+                  (concat "[][.," c-alnum "_? \t\n\r]*"
+                          "\\)*"))
+              ">")))
+
+(defconst cc-imenu-java-type-spec-regexp
+  (concat
+   ;; zero or more identifiers followed by a dot
+   "\\("
+     "[" c-alpha "_][" c-alnum "_]*\\."
+   "\\)*"
+   ;; a single mandatory identifier without a dot
+   "[" c-alpha "_][" c-alnum "_]*"
+   ;; then choice:
+   "\\("
+   ;; (option 1) type arguments list which _may_ be followed with brackets
+   ;; and/or spaces, then optional variable arity
+     "[ \t\n\r]*"
+     (cc-imenu-java-build-type-args-regex 3)
+     "[][ \t\n\r]*"
+     "\\(" cc-imenu-java-ellipsis-regexp "\\)?"
+   "\\|"
+   ;; (option 2) just brackets and/or spaces (there should be at least one),
+   ;; then optional variable arity
+     "[][ \t\n\r]+"
+     "\\(" cc-imenu-java-ellipsis-regexp "\\)?"
+   "\\|"
+   ;; (option 3) just variable arity
+     cc-imenu-java-ellipsis-regexp
+   "\\)"))
+
+(defconst cc-imenu-java-comment-regexp
+  (concat
+   "/"
+   "\\("
+   ;; a traditional comment
+     "\\*"
+     "\\("
+       "[^*]"
+     "\\|"
+       "\\*+[^/*]"
+     "\\)*"
+     "\\*+/"
+   "\\|"
+   ;; an end-of-line comment
+     "/[^\n\r]*[\n\r]"
+   "\\)"
+  "[ \t\n\r]*"
+   ))
+
+;; Comments are allowed before the argument, after any of the
+;; modifiers and after the identifier.
+(defconst cc-imenu-java-method-arg-regexp
+  (concat
+   "\\(" cc-imenu-java-comment-regexp "\\)*"
+   ;; optional modifiers
+   "\\("
+     ;; a modifier is either an annotation or "final"
+     "\\("
+       "@[" c-alpha "_]"
+       "[" c-alnum "._]*"
+       ;; TODO support element-value pairs!
+     "\\|"
+       "final"
+     "\\)"
+     ;; a modifier ends with comments and/or ws
+     "\\("
+       "\\(" cc-imenu-java-comment-regexp "\\)+"
+     "\\|"
+       "[ \t\n\r]+"
+       "\\(" cc-imenu-java-comment-regexp "\\)*"
+     "\\)"
+   "\\)*"
+   ;; type spec
+   cc-imenu-java-type-spec-regexp
+   ;; identifier
+   "[" c-alpha "_]"
+   "[" c-alnum "_]*"
+   ;; optional comments and/or ws
+   "[ \t\n\r]*"
+   "\\(" cc-imenu-java-comment-regexp "\\)*"
+   ))
+
+(defconst cc-imenu-java-generic-expression
   `((nil
      ,(concat
-       "[" c-alpha "_][\]\[." c-alnum "_<> ]+[ \t\n\r]+" ; type spec
-       "\\([" c-alpha "_][" c-alnum "_]*\\)" ; method name
+       cc-imenu-java-type-spec-regexp
+       "\\("                                  ; method name which gets captured
+                                              ; into index
+         "[" c-alpha "_]"
+         "[" c-alnum "_]*"
+       "\\)"
        "[ \t\n\r]*"
-       ;; An argument list htat is either empty or contains any number
-       ;; of arguments.  An argument is any number of annotations
-       ;; followed by a type spec followed by a word.  A word is an
-       ;; identifier.  A type spec is an identifier, possibly followed
-       ;; by < typespec > possibly followed by [].
-       (concat "("
-               "\\("
-               "[ \t\n\r]*"
-               "\\("
-               "@"
-               "[" c-alpha "_]"
-               "[" c-alnum "._]""*"
-               "[ \t\n\r]+"
-               "\\)*"
-               "\\("
-               "[" c-alpha "_]"
-               "[\]\[" c-alnum "_.]*"
-               "\\("
-
-               "<"
-               "[ \t\n\r]*"
-               "[\]\[.," c-alnum "_<> \t\n\r]*"
-               ">"
-               "\\)?"
-               "\\(\\[\\]\\)?"
-               "[ \t\n\r]+"
-               "\\)"
-               "[" c-alpha "_]"
-               "[" c-alnum "_]*"
-               "[ \t\n\r,]*"
-               "\\)*"
-               ")"
-               "[.," c-alnum " \t\n\r]*"
-               "{"
-               )) 1))
+       ;; An argument list that contains zero or more arguments.
+       (concat
+        "("
+        "[ \t\n\r]*"
+        "\\("
+          "\\(" cc-imenu-java-method-arg-regexp ",[ \t\n\r]*\\)*"
+          cc-imenu-java-method-arg-regexp
+        "\\)?"
+        ")"
+        "[.,_" c-alnum " \t\n\r]*"            ; throws etc.
+        "{"
+        )) 7))
   "Imenu generic expression for Java mode.  See `imenu-generic-expression'.")
 
+
 ;; Internal variables
 (defvar cc-imenu-objc-generic-expression-noreturn-index nil)
 (defvar cc-imenu-objc-generic-expression-general-func-index nil)
diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el
index 3c3a5766582..17e80b8b25b 100644
--- a/lisp/progmodes/cc-mode.el
+++ b/lisp/progmodes/cc-mode.el
@@ -936,7 +936,8 @@ Note that the style variables are always made local to the buffer."
 
     ;; Add needed properties to each CPP construct in the region.
     (goto-char c-new-BEG)
-    (let ((pps-position c-new-BEG)  pps-state mbeg)
+    (skip-chars-backward " \t")
+    (let ((pps-position (point))  pps-state mbeg)
       (while (and (< (point) c-new-END)
                   (search-forward-regexp c-anchored-cpp-prefix c-new-END t))
         ;; If we've found a "#" inside a string/comment, ignore it.
@@ -945,14 +946,12 @@ Note that the style variables are always made local to the buffer."
               pps-position (point))
         (unless (or (nth 3 pps-state)   ; in a string?
                     (nth 4 pps-state))  ; in a comment?
-          (goto-char (match-beginning 0))
+          (goto-char (match-beginning 1))
           (setq mbeg (point))
           (if (> (c-syntactic-end-of-macro) mbeg)
               (progn
                 (c-neutralize-CPP-line mbeg (point))
-                (c-set-cpp-delimiters mbeg (point))
-                ;(setq pps-position (point))
-                )
+                (c-set-cpp-delimiters mbeg (point)))
             (forward-line))           ; no infinite loop with, e.g., "#//"
           )))))
 
diff --git a/lisp/progmodes/ruby-mode.el b/lisp/progmodes/ruby-mode.el
index 6e471d1aa2a..631badac34c 100644
--- a/lisp/progmodes/ruby-mode.el
+++ b/lisp/progmodes/ruby-mode.el
@@ -847,22 +847,24 @@ Can be one of `heredoc', `modifier', `expr-qstr', `expr-re'."
         indent))))
 
 (defun ruby-beginning-of-defun (&optional arg)
-  "Move backward to the beginning of the current top-level defun.
+  "Move backward to the beginning of the current defun.
 With ARG, move backward multiple defuns.  Negative ARG means
 move forward."
   (interactive "p")
-  (and (re-search-backward (concat "^\\s *" ruby-defun-beg-re "\\_>")
-                           nil t (or arg 1))
-       (beginning-of-line)))
-
-(defun ruby-end-of-defun (&optional arg)
-  "Move forward to the end of the current top-level defun.
-With ARG, move forward multiple defuns.  Negative ARG means
-move backward."
+  (let (case-fold-search)
+    (and (re-search-backward (concat "^\\s *" ruby-defun-beg-re "\\_>")
+                             nil t (or arg 1))
+         (beginning-of-line))))
+
+(defun ruby-end-of-defun ()
+  "Move point to the end of the current defun.
+The defun begins at or after the point.  This function is called
+by `end-of-defun'."
   (interactive "p")
   (ruby-forward-sexp)
-  (when (looking-back (concat "^\\s *" ruby-block-end-re))
-    (forward-line 1)))
+  (let (case-fold-search)
+    (when (looking-back (concat "^\\s *" ruby-block-end-re))
+      (forward-line 1))))
 
 (defun ruby-beginning-of-indent ()
   "Backtrack to a line which can be used as a reference for
@@ -881,6 +883,7 @@ current block, a sibling block, or an outer block.  Do that (abs N) times."
         (depth (or (nth 2 (ruby-parse-region (line-beginning-position)
                                              (line-end-position)))
                    0))
+        case-fold-search
         down done)
     (when (< (* depth signum) 0)
       ;; Moving end -> end or beginning -> beginning.
diff --git a/lisp/term/ns-win.el b/lisp/term/ns-win.el
index 5617c31beff..0d4d3aaa26b 100644
--- a/lisp/term/ns-win.el
+++ b/lisp/term/ns-win.el
@@ -895,7 +895,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
 
 ;; Do the actual Nextstep Windows setup here; the above code just
 ;; defines functions and variables that we use now.
-(defun ns-initialize-window-system (&optional display)
+(defun ns-initialize-window-system (&optional _display)
   "Initialize Emacs for Nextstep (Cocoa / GNUstep) windowing."
   (cl-assert (not ns-initialized))
 
diff --git a/lisp/term/w32-win.el b/lisp/term/w32-win.el
index b0f65812eab..acadb0fad43 100644
--- a/lisp/term/w32-win.el
+++ b/lisp/term/w32-win.el
@@ -246,7 +246,7 @@ See the documentation of `create-fontset-from-fontset-spec' for the format.")
 (declare-function x-parse-geometry "frame.c" (string))
 (defvar x-command-line-resources)
 
-(defun w32-initialize-window-system (&optional display)
+(defun w32-initialize-window-system (&optional _display)
   "Initialize Emacs for W32 GUI frames."
   (cl-assert (not w32-initialized))
 
diff --git a/src/ChangeLog b/src/ChangeLog
index 11b82f57108..04a6c353619 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2013-04-16  Juanma Barranquero  <lekktu@gmail.com>
+
+        * minibuf.c (Ftest_completion): Silence compiler warning.
+
 2013-04-15  Eli Zaretskii  <eliz@gnu.org>
 
         * w32fns.c (w32_wnd_proc): Add more assertions to investigate
@@ -1257,7 +1261,7 @@
         (Fcommand_execute): Remove, replace by an Elisp implementation.
         (syms_of_keyboard): Adjust accordingly.
 
-2013-02-19  Daniel Colascione <dancol@dancol.org>
+2013-02-19  Daniel Colascione  <dancol@dancol.org>
 
         * sheap.c (report_sheap_usage): Use message, not message1, so
         that we don't try to create a buffer while we're in the middle
@@ -12081,9 +12085,9 @@
         to denote vector blocks.  Adjust users (live_vector_p,
         mark_maybe_pointer, valid_lisp_object_p) accordingly.
         (COMMON_MULTIPLE): Move outside #if USE_LSB_TAG.
-        (VECTOR_BLOCK_SIZE, vroundup, VECTOR_BLOCK_BYTES),
-        (VBLOCK_BYTES_MIN, VBLOCK_BYTES_MAX, VECTOR_MAX_FREE_LIST_INDEX),
-        (VECTOR_FREE_LIST_FLAG, ADVANCE, VINDEX, SETUP_ON_FREE_LIST),
+        (VECTOR_BLOCK_SIZE, vroundup, VECTOR_BLOCK_BYTES)
+        (VBLOCK_BYTES_MIN, VBLOCK_BYTES_MAX, VECTOR_MAX_FREE_LIST_INDEX)
+        (VECTOR_FREE_LIST_FLAG, ADVANCE, VINDEX, SETUP_ON_FREE_LIST)
         (VECTOR_SIZE, VECTOR_IN_BLOCK): New macros.
         (roundup_size): New constant.
         (struct vector_block): New data type.
diff --git a/src/minibuf.c b/src/minibuf.c
index 4cc1f8d435a..b96d27e0742 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1799,8 +1799,8 @@ the values STRING, PREDICATE and `lambda'.  */)
   else if (HASH_TABLE_P (collection))
     {
       struct Lisp_Hash_Table *h = XHASH_TABLE (collection);
-      i = hash_lookup (h, string, NULL);
       Lisp_Object key = Qnil;
+      i = hash_lookup (h, string, NULL);
       if (i >= 0)
         tem = HASH_KEY (h, i);
       else
diff --git a/test/automated/ruby-mode-tests.el b/test/automated/ruby-mode-tests.el
index 0ebe6d44e34..23dc45ad509 100644
--- a/test/automated/ruby-mode-tests.el
+++ b/test/automated/ruby-mode-tests.el
@@ -487,6 +487,42 @@ VALUES-PLIST is a list with alternating index and value elements."
     (ruby-beginning-of-block)
     (should (= 1 (line-number-at-pos)))))
 
+(ert-deftest ruby-move-to-block-does-not-fold-case ()
+  (ruby-with-temp-buffer
+      (ruby-test-string
+       "foo do
+       |  Module.to_s
+       |end")
+    (end-of-buffer)
+    (let ((case-fold-search t))
+      (ruby-beginning-of-block))
+    (should (= 1 (line-number-at-pos)))))
+
+(ert-deftest ruby-beginning-of-defun-does-not-fold-case ()
+  (ruby-with-temp-buffer
+      (ruby-test-string
+       "class C
+       |  def bar
+       |    Class.to_s
+       |  end
+       |end")
+    (goto-line 4)
+    (let ((case-fold-search t))
+      (beginning-of-defun))
+    (should (= 2 (line-number-at-pos)))))
+
+(ert-deftest ruby-end-of-defun-skips-to-next-line-after-the-method ()
+  (ruby-with-temp-buffer
+      (ruby-test-string
+       "class D
+       |  def tee
+       |    'ho hum'
+       |  end
+       |end")
+    (goto-line 2)
+    (end-of-defun)
+    (should (= 5 (line-number-at-pos)))))
+
 (provide 'ruby-mode-tests)
 
 ;;; ruby-mode-tests.el ends here