Commit 25721031 authored by Chong Yidong's avatar Chong Yidong
Browse files

Merge from emacs-24 branch; up to 2012-05-01T10:20:43Z!rgm@gnu.org

parents 316e68a7 2c73e345
2012-07-19 Chong Yidong <cyd@gnu.org>
* emacs.texi: Update ISBN.
2012-07-17 Chong Yidong <cyd@gnu.org> 2012-07-17 Chong Yidong <cyd@gnu.org>
* basic.texi (Inserting Text): Replace ucs-insert with * basic.texi (Inserting Text): Replace ucs-insert with
......
...@@ -94,7 +94,7 @@ developing GNU and promoting software freedom.'' ...@@ -94,7 +94,7 @@ developing GNU and promoting software freedom.''
Published by the Free Software Foundation @* Published by the Free Software Foundation @*
51 Franklin Street, Fifth Floor @* 51 Franklin Street, Fifth Floor @*
Boston, MA 02110-1301 USA @* Boston, MA 02110-1301 USA @*
ISBN 978-0-9831592-2-3 ISBN 978-0-9831592-3-0
@sp 2 @sp 2
Cover art by Etienne Suvasa; cover design by Matt Lee. Cover art by Etienne Suvasa; cover design by Matt Lee.
......
2012-07-21 Leo Liu <sdl.web@gmail.com>
* progmodes/cc-cmds.el (c-defun-name): Use
match-string-no-properties instead for consistency.
2012-07-20 Leo Liu <sdl.web@gmail.com>
* progmodes/cc-cmds.el (c-defun-name): Handle objc selectors properly.
(Bug#7879)
* progmodes/cc-langs.el (c-symbol-start): Include char _ (bug#11986).
2012-07-20 Stefan Monnier <monnier@iro.umontreal.ca>
* userlock.el, emacs-lisp/map-ynp.el: Declare part of `emacs' package.
* progmodes/bug-reference.el, misearch.el: Provide themselves
(bug#11915).
* progmodes/cperl-mode.el (cperl-unwind-to-safe): Don't inf-loop at end
of narrowed buffer (bug#11966).
2012-07-20 Vincent Belaïche <vincentb1@users.sourceforge.net> 2012-07-20 Vincent Belaïche <vincentb1@users.sourceforge.net>
   
* ses.el (ses-rename-cell): Set new name also in reference list of * ses.el (ses-rename-cell): Set new name also in reference list of
......
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
;; Author: Roland McGrath <roland@gnu.org> ;; Author: Roland McGrath <roland@gnu.org>
;; Maintainer: FSF ;; Maintainer: FSF
;; Keywords: lisp, extensions ;; Keywords: lisp, extensions
;; Package: emacs
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
......
...@@ -373,5 +373,5 @@ whose file names match the specified wildcard." ...@@ -373,5 +373,5 @@ whose file names match the specified wildcard."
(provide 'multi-isearch) (provide 'multi-isearch)
(provide 'misearch)
;;; misearch.el ends here ;;; misearch.el ends here
...@@ -30,6 +30,8 @@ ...@@ -30,6 +30,8 @@
;; Two minor modes are provided. One works on any text in the buffer; ;; Two minor modes are provided. One works on any text in the buffer;
;; the other operates only on comments and strings. ;; the other operates only on comments and strings.
;;; Code:
(defvar bug-reference-map (defvar bug-reference-map
(let ((map (make-sparse-keymap))) (let ((map (make-sparse-keymap)))
(define-key map [mouse-2] 'bug-reference-push-button) (define-key map [mouse-2] 'bug-reference-push-button)
...@@ -154,4 +156,5 @@ the mode if ARG is omitted or nil." ...@@ -154,4 +156,5 @@ the mode if ARG is omitted or nil."
(widen) (widen)
(bug-reference-unfontify (point-min) (point-max))))) (bug-reference-unfontify (point-min) (point-max)))))
(provide 'bug-reference)
;;; bug-reference.el ends here ;;; bug-reference.el ends here
...@@ -1826,14 +1826,16 @@ with a brace block." ...@@ -1826,14 +1826,16 @@ with a brace block."
;; DEFFLAGSET(syslog_opt_flags,LOG_PID ...) ==> syslog_opt_flags ;; DEFFLAGSET(syslog_opt_flags,LOG_PID ...) ==> syslog_opt_flags
(match-string-no-properties 1)) (match-string-no-properties 1))
;; Objective-C method starting with + or -. ;; Objc selectors.
((and (derived-mode-p 'objc-mode) ((assq 'objc-method-intro (c-guess-basic-syntax))
(looking-at "[-+]\s*(")) (let ((bound (save-excursion (c-end-of-statement) (point)))
(when (c-syntactic-re-search-forward ")\s*" nil t) (kw-re (concat "\\(?:" c-symbol-key "\\)?:"))
(c-forward-token-2) (stretches))
(setq name-end (point)) (when (c-syntactic-re-search-forward c-symbol-key bound t t t)
(c-backward-token-2) (push (match-string-no-properties 0) stretches)
(buffer-substring-no-properties (point) name-end))) (while (c-syntactic-re-search-forward kw-re bound t t t)
(push (match-string-no-properties 0) stretches)))
(apply 'concat (nreverse stretches))))
(t (t
;; Normal function or initializer. ;; Normal function or initializer.
......
...@@ -578,7 +578,7 @@ keyword. It's unspecified how far it matches. Does not contain a \\| ...@@ -578,7 +578,7 @@ keyword. It's unspecified how far it matches. Does not contain a \\|
operator at the top level." operator at the top level."
t (concat "[" c-alpha "_]") t (concat "[" c-alpha "_]")
java (concat "[" c-alpha "_@]") java (concat "[" c-alpha "_@]")
objc (concat "[" c-alpha "@]") objc (concat "[" c-alpha "_@]")
pike (concat "[" c-alpha "_`]")) pike (concat "[" c-alpha "_`]"))
(c-lang-defvar c-symbol-start (c-lang-const c-symbol-start)) (c-lang-defvar c-symbol-start (c-lang-const c-symbol-start))
......
...@@ -3497,7 +3497,8 @@ Works before syntax recognition is done." ...@@ -3497,7 +3497,8 @@ Works before syntax recognition is done."
(if end (if end
;; Do the same for end, going small steps ;; Do the same for end, going small steps
(save-excursion (save-excursion
(while (and end (get-text-property end 'syntax-type)) (while (and end (< end (point-max))
(get-text-property end 'syntax-type))
(setq pos end (setq pos end
end (next-single-property-change end 'syntax-type nil (point-max))) end (next-single-property-change end 'syntax-type nil (point-max)))
(if end (progn (goto-char end) (if end (progn (goto-char end)
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
;; Maintainer: FSF ;; Maintainer: FSF
;; Keywords: internal ;; Keywords: internal
;; Package: emacs
;; This file is part of GNU Emacs. ;; This file is part of GNU Emacs.
......
...@@ -484,9 +484,7 @@ for future use. */) ...@@ -484,9 +484,7 @@ for future use. */)
(Lisp_Object window, Lisp_Object limit) (Lisp_Object window, Lisp_Object limit)
{ {
register struct window *w = decode_any_window (window); register struct window *w = decode_any_window (window);
w->combination_limit = limit; w->combination_limit = limit;
return w->combination_limit; return w->combination_limit;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment