Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 99469. ------------------------------------------------------------ revno: 99469 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-02-07 23:20:58 -0800 message: Close bug#5529. * buffers.texi (Uniquify): Must explicitly load library. (Bug#5529) diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2010-02-01 18:39:33 +0000 +++ doc/emacs/ChangeLog 2010-02-08 07:20:58 +0000 @@ -1,3 +1,7 @@ +2010-02-08 Glenn Morris + + * buffers.texi (Uniquify): Must explicitly load library. (Bug#5529) + 2010-02-01 Stefan Monnier * display.texi (Useless Whitespace, Text Display): === modified file 'doc/emacs/buffers.texi' --- doc/emacs/buffers.texi 2010-01-13 08:35:10 +0000 +++ doc/emacs/buffers.texi 2010-02-08 07:20:58 +0000 @@ -583,7 +583,8 @@ @vindex uniquify-buffer-name-style Other methods work by adding parts of each file's directory to the -buffer name. To select one, customize the variable +buffer name. To select one, load the library @file{uniquify} (e.g. +using @code{(require 'uniquify)}, and customize the variable @code{uniquify-buffer-name-style} (@pxref{Easy Customization}). To begin with, the @code{forward} naming method includes part of the ------------------------------------------------------------ revno: 99468 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Mon 2010-02-08 16:11:11 +0900 message: international/mule-util.el (with-coding-priority): Add autoload cookie for putting lisp-indent-funciton. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-07 20:23:20 +0000 +++ lisp/ChangeLog 2010-02-08 07:08:18 +0000 @@ -1,3 +1,8 @@ +2010-02-08 Kenichi Handa + + * international/mule-util.el (with-coding-priority): Add autoload + cookie for putting `lisp-indent-funciton'. + 2010-02-07 Glenn Morris * progmodes/f90.el (f90-font-lock-keywords-1, f90-font-lock-keywords-2): === modified file 'lisp/international/mule-util.el' --- lisp/international/mule-util.el 2010-01-13 08:35:10 +0000 +++ lisp/international/mule-util.el 2010-02-08 07:08:18 +0000 @@ -323,7 +323,7 @@ (unwind-protect (progn ,@body) (apply #'set-coding-system-priority ,current))))) -(put 'with-coding-priority 'lisp-indent-function 1) +;;;###autoload(put 'with-coding-priority 'lisp-indent-function 1) (put 'with-coding-priority 'edebug-form-spec t) ;;;###autoload ------------------------------------------------------------ revno: 99467 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-02-07 12:23:20 -0800 message: Fix previous change for F2003 interfaces. * progmodes/f90.el (f90-font-lock-keywords-1, f90-font-lock-keywords-2): Move F2003 named interfaces from keywords-2 to keywords-1, and use function-name-face rather than constant-face. Simplify "abstract interface" regexp. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-02-07 06:23:10 +0000 +++ lisp/ChangeLog 2010-02-07 20:23:20 +0000 @@ -1,3 +1,10 @@ +2010-02-07 Glenn Morris + + * progmodes/f90.el (f90-font-lock-keywords-1, f90-font-lock-keywords-2): + Move F2003 named interfaces from keywords-2 to keywords-1, and + use function-name-face rather than constant-face. + Simplify "abstract interface" regexp. + 2010-02-07 Chong Yidong * eshell/esh-util.el (eshell-file-attributes): New optional arg === modified file 'lisp/progmodes/f90.el' --- lisp/progmodes/f90.el 2010-02-07 01:41:45 +0000 +++ lisp/progmodes/f90.el 2010-02-07 20:23:20 +0000 @@ -158,10 +158,8 @@ ;; 3. Support for align. ;; Font-locking: ;; 1. OpenMP, OpenMPI?, preprocessor highlighting. -;; 2. interface blah - Highlight "blah" in function-name face? -;; Need to avoid "interface operator (+)" etc. -;; 3. integer_name = 1 -;; 4. Labels for "else" statements (F2003)? +;; 2. integer_name = 1 +;; 3. Labels for "else" statements (F2003)? (defvar comment-auto-fill-only-comments) (defvar font-lock-keywords) @@ -467,22 +465,21 @@ ;;; (1 font-lock-keyword-face) (3 font-lock-function-name-face)) '(f90-typedef-matcher (1 font-lock-keyword-face) (2 font-lock-function-name-face)) - ;; Other functions and declarations. + ;; F2003. Prevent operators being highlighted as functions. + '("\\<\\(\\(?:end[ \t]*\\)?interface[ \t]*\\(?:assignment\\|operator\\|\ +read\\|write\\)\\)[ \t]*(" (1 font-lock-keyword-face t)) + ;; Other functions and declarations. Named interfaces = F2003. '("\\<\\(\\(?:end[ \t]*\\)?\\(program\\|module\\|function\\|associate\\|\ -subroutine\\)\\|use\\|call\\)\\>[ \t]*\\(\\sw+\\)?" +subroutine\\|interface\\)\\|use\\|call\\)\\>[ \t]*\\(\\sw+\\)?" (1 font-lock-keyword-face) (3 font-lock-function-name-face nil t)) ;; F2003. '("\\<\\(use\\)[ \t]*,[ \t]*\\(\\(?:non_\\)?intrinsic\\)[ \t]*::[ \t]*\ \\(\\sw+\\)" (1 font-lock-keyword-face) (2 font-lock-keyword-face) (3 font-lock-function-name-face)) - "\\<\\(\\(end[ \t]*\\)?block[ \t]*data\\|contains\\|\ -end[ \t]*interface\\)\\>" - ;; "abstract interface" is F2003. Must come after previous entry. - '("\\<\\(\\(?:abstract[ \t]*\\)?interface\\)\\>" - ;; [ \t]*\\(\\(\\sw+\\)[ \t]*[^(]\\)?" - ;; (2) messes up "interface operator ()", etc. - (1 font-lock-keyword-face))) ;(2 font-lock-function-name-face nil t))) + "\\<\\(\\(end[ \t]*\\)?block[ \t]*data\\|contains\\)\\>" + ;; "abstract interface" is F2003. + '("\\" (0 font-lock-keyword-face t))) "This does fairly subdued highlighting of comments and function calls.") ;; NB not explicitly handling this, yet it seems to work. @@ -560,12 +557,6 @@ (5 font-lock-function-name-face t) (6 'default t)) ;; enum (F2003; must be followed by ", bind(C)"). '("\\<\\(enum\\)[ \t]*," (1 font-lock-keyword-face)) - ;; F2003. Prevent operators being highlighted as constants. - '("\\<\\(\\(?:end[ \t]*\\)?interface[ \t]*\\(?:assignment\\|operator\\|\ -read\\|write\\)\\)[ \t]*(" (1 font-lock-keyword-face t)) - ;; Interface blocks can be named in F2003. - '("\\<\\(\\(?:end[ \t]*\\)?interface\\)[ \t]*\\(\\sw+\\)?\\>" - (1 font-lock-keyword-face) (2 font-lock-constant-face nil t)) ;; end do, enum (F2003), if, select, where, and forall constructs. '("\\<\\(end[ \t]*\\(do\\|if\\|enum\\|select\\|forall\\|where\\)\\)\\>\ \\([ \t]+\\(\\sw+\\)\\)?" ------------------------------------------------------------ revno: 99466 committer: Chong Yidong branch nick: trunk timestamp: Sun 2010-02-07 01:36:17 -0500 message: * erc-services.el (erc-nickserv-alist): Fix defcustom type (Bug#5520). diff: === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2010-01-25 18:49:23 +0000 +++ lisp/erc/ChangeLog 2010-02-07 06:36:17 +0000 @@ -1,3 +1,7 @@ +2010-02-07 Vivek Dasmohapatra + + * erc-services.el (erc-nickserv-alist): Fix defcustom type (Bug#5520). + 2010-01-25 Vivek Dasmohapatra * erc-backend.el (erc-session-connector): New var. === modified file 'lisp/erc/erc-services.el' --- lisp/erc/erc-services.el 2010-01-13 08:35:10 +0000 +++ lisp/erc/erc-services.el 2010-02-07 06:36:17 +0000 @@ -303,7 +303,11 @@ (boolean :tag "Use current nick in identify message?") (choice :tag "Command to use (optional)" (string :tag "Command") - (const :tag "No special command necessary" nil))))) + (const :tag "No special command necessary" nil)) + (choice :tag "Detect Success" + (regexp :tag "Pattern to match") + (const :tag "Do not try to detect success" nil))))) + (defsubst erc-nickserv-alist-sender (network &optional entry) (nth 1 (or entry (assoc network erc-nickserv-alist)))) ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.