Now on revision 110411. ------------------------------------------------------------ revno: 110411 committer: Fabián Ezequiel Gallina branch nick: trunk timestamp: Sun 2012-10-07 01:33:16 -0300 message: Fix shell output retrieval and comint-prompt-regexp init. * progmodes/python.el (inferior-python-mode): (python-shell-make-comint): Fix initialization of comint-prompt-regexp from copied file local variables. (python-shell-fetched-lines): Remove var. (python-shell-output-filter-in-progress): Rename from python-shell-fetch-lines-in-progress. (python-shell-output-filter-buffer): Rename from python-shell-fetch-lines-string. (python-shell-fetch-lines-filter): Delete function. (python-shell-output-filter): New function. (python-shell-send-string-no-output): Use them. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-07 00:27:31 +0000 +++ lisp/ChangeLog 2012-10-07 04:33:16 +0000 @@ -1,3 +1,18 @@ +2012-10-07 Fabián Ezequiel Gallina + + Fix shell output retrieval and comint-prompt-regexp init. + * progmodes/python.el (inferior-python-mode): + (python-shell-make-comint): Fix initialization of + comint-prompt-regexp from copied file local variables. + (python-shell-fetched-lines): Remove var. + (python-shell-output-filter-in-progress): Rename from + python-shell-fetch-lines-in-progress. + (python-shell-output-filter-buffer): Rename from + python-shell-fetch-lines-string. + (python-shell-fetch-lines-filter): Delete function. + (python-shell-output-filter): New function. + (python-shell-send-string-no-output): Use them. + 2012-10-07 Glenn Morris * hi-lock.el (hi-lock-process-phrase): === modified file 'lisp/progmodes/python.el' --- lisp/progmodes/python.el 2012-10-05 13:42:08 +0000 +++ lisp/progmodes/python.el 2012-10-07 04:33:16 +0000 @@ -1667,10 +1667,6 @@ \(Type \\[describe-mode] in the process buffer for a list of commands.)" (set-syntax-table python-mode-syntax-table) (setq mode-line-process '(":%s")) - (setq comint-prompt-regexp (format "^\\(?:%s\\|%s\\|%s\\)" - python-shell-prompt-regexp - python-shell-prompt-block-regexp - python-shell-prompt-pdb-regexp)) (make-local-variable 'comint-output-filter-functions) (add-hook 'comint-output-filter-functions 'python-comint-output-filter-function) @@ -1720,7 +1716,11 @@ (process (get-buffer-process buffer))) (with-current-buffer buffer (inferior-python-mode) - (python-util-clone-local-variables current-buffer)) + (python-util-clone-local-variables current-buffer) + (setq comint-prompt-regexp (format "^\\(?:%s\\|%s\\|%s\\)" + python-shell-prompt-regexp + python-shell-prompt-block-regexp + python-shell-prompt-pdb-regexp))) (accept-process-output process) (and pop (pop-to-buffer buffer t)) (and internal (set-process-query-on-exit-flag process nil)))) @@ -1861,26 +1861,39 @@ (string-match "\n[ \t].*\n?$" string)) (comint-send-string process "\n"))))) -;; Shell output catching stolen from gud-gdb -(defvar python-shell-fetch-lines-in-progress nil) -(defvar python-shell-fetch-lines-string nil) -(defvar python-shell-fetched-lines nil) +(defvar python-shell-output-filter-in-progress nil) +(defvar python-shell-output-filter-buffer nil) -(defun python-shell-fetch-lines-filter (string) - "Filter used to read the list of lines output by a command. -STRING is the output to filter." - (setq string (concat python-shell-fetch-lines-string string)) - (while (string-match "\n" string) - (push (substring string 0 (match-beginning 0)) - python-shell-fetched-lines) - (setq string (substring string (match-end 0)))) - (if (equal (string-match comint-prompt-regexp string) 0) - (progn - (setq python-shell-fetch-lines-in-progress nil) - string) - (progn - (setq python-shell-fetch-lines-string string) - ""))) +(defun python-shell-output-filter (string) + "Filter used in `python-shell-send-string-no-output' to grab output. +STRING is the output received to this point from the process. +This filter saves received output from the process in +`python-shell-output-filter-buffer' and stops receiving it after +detecting a prompt at the end of the buffer." + (setq + string (ansi-color-filter-apply string) + python-shell-output-filter-buffer + (concat python-shell-output-filter-buffer string)) + (when (string-match + (format "\n\\(?:%s\\|%s\\|%s\\)$" + python-shell-prompt-regexp + python-shell-prompt-block-regexp + python-shell-prompt-pdb-regexp) + python-shell-output-filter-buffer) + ;; Output ends when `python-shell-output-filter-buffer' contains + ;; the prompt attached at the end of it. + (setq python-shell-output-filter-in-progress nil + python-shell-output-filter-buffer + (substring python-shell-output-filter-buffer + 0 (match-beginning 0))) + (when (and (> (length python-shell-prompt-output-regexp) 0) + (string-match (concat "^" python-shell-prompt-output-regexp) + python-shell-output-filter-buffer)) + ;; Some shells, like iPython might append a prompt before the + ;; output, clean that. + (setq python-shell-output-filter-buffer + (substring python-shell-output-filter-buffer (match-end 0))))) + "") (defun python-shell-send-string-no-output (string &optional process msg) "Send STRING to PROCESS and inhibit output. @@ -1888,18 +1901,20 @@ the output." (let ((process (or process (python-shell-get-or-create-process))) (comint-preoutput-filter-functions - '(python-shell-fetch-lines-filter)) - (python-shell-fetch-lines-in-progress t) + '(python-shell-output-filter)) + (python-shell-output-filter-in-progress t) (inhibit-quit t)) (or (with-local-quit (python-shell-send-string string process msg) - (while python-shell-fetch-lines-in-progress + (while python-shell-output-filter-in-progress + ;; `python-shell-output-filter' takes care of setting + ;; `python-shell-output-filter-in-progress' to NIL after it + ;; detects end of output. (accept-process-output process)) (prog1 - (mapconcat #'identity - (reverse python-shell-fetched-lines) "\n") - (setq python-shell-fetched-lines nil))) + python-shell-output-filter-buffer + (setq python-shell-output-filter-buffer nil))) (with-current-buffer (process-buffer process) (comint-interrupt-subjob))))) ------------------------------------------------------------ revno: 110410 committer: Paul Eggert branch nick: trunk timestamp: Sat 2012-10-06 19:26:03 -0700 message: Improve sys_siglist detection. * configure.ac (sys_siglist): Look for its decl in . Otherwise, it's not found in either Fedora 17 or Solaris 11. * src/sysdep.c (sys_siglist, init_signals): Use _sys_siglist if it's defined as a macro, as is done in Solaris. (sys_siglist_entries): New macro. (save_strsignal): Use it. * src/syssignal.h (safe_strsignal): Now ATTRIBUTE_CONST, to pacify GCC 4.7.2 on Fedora 17 with the fixed sys_siglist detection. diff: === modified file 'ChangeLog' --- ChangeLog 2012-10-04 07:23:35 +0000 +++ ChangeLog 2012-10-07 02:26:03 +0000 @@ -1,3 +1,9 @@ +2012-10-07 Paul Eggert + + Improve sys_siglist detection. + * configure.ac (sys_siglist): Look for its decl in . + Otherwise, it's not found in either Fedora 17 or Solaris 11. + 2012-10-04 Paul Eggert Merge from gnulib, incorporating: === modified file 'configure.ac' --- configure.ac 2012-10-06 00:44:36 +0000 +++ configure.ac 2012-10-07 02:26:03 +0000 @@ -1284,10 +1284,12 @@ dnl it doesn't define `bool'. AC_CHECK_HEADERS(term.h, , , -) AC_HEADER_TIME -AC_CHECK_DECLS([sys_siglist]) +AC_CHECK_DECLS([sys_siglist], [], [], [[#include + ]]) if test $ac_cv_have_decl_sys_siglist != yes; then # For Tru64, at least: - AC_CHECK_DECLS([__sys_siglist]) + AC_CHECK_DECLS([__sys_siglist], [], [], [[#include + ]]) if test $ac_cv_have_decl___sys_siglist = yes; then AC_DEFINE(sys_siglist, __sys_siglist, [Define to any substitute for sys_siglist.]) === modified file 'src/ChangeLog' --- src/ChangeLog 2012-10-06 17:31:11 +0000 +++ src/ChangeLog 2012-10-07 02:26:03 +0000 @@ -1,3 +1,13 @@ +2012-10-07 Paul Eggert + + Improve sys_siglist detection. + * sysdep.c (sys_siglist, init_signals): Use _sys_siglist if it's + defined as a macro, as is done in Solaris. + (sys_siglist_entries): New macro. + (save_strsignal): Use it. + * syssignal.h (safe_strsignal): Now ATTRIBUTE_CONST, to pacify + GCC 4.7.2 on Fedora 17 with the fixed sys_siglist detection. + 2012-10-06 Jan Djärv * nsfns.m (Fx_create_frame): Call x_default_parameter with === modified file 'src/sysdep.c' --- src/sysdep.c 2012-10-01 22:12:44 +0000 +++ src/sysdep.c 2012-10-07 02:26:03 +0000 @@ -1545,8 +1545,18 @@ #if !HAVE_DECL_SYS_SIGLIST # undef sys_siglist -# define sys_siglist my_sys_siglist +# ifdef _sys_siglist +# define sys_siglist _sys_siglist +# else +# define sys_siglist my_sys_siglist static char const *sys_siglist[NSIG]; +# endif +#endif + +#ifdef _sys_nsig +# define sys_siglist_entries _sys_nsig +#else +# define sys_siglist_entries NSIG #endif /* Handle bus errors, invalid instruction, etc. */ @@ -1609,7 +1619,7 @@ main_thread = pthread_self (); #endif -#if !HAVE_DECL_SYS_SIGLIST +#if !HAVE_DECL_SYS_SIGLIST && !defined _sys_siglist if (! initialized) { sys_siglist[SIGABRT] = "Aborted"; @@ -1757,7 +1767,7 @@ sys_siglist[SIGXFSZ] = "File size limit exceeded"; # endif } -#endif /* !HAVE_DECL_SYS_SIGLIST */ +#endif /* !HAVE_DECL_SYS_SIGLIST && !_sys_siglist */ /* Don't alter signal handlers if dumping. On some machines, changing signal handlers sets static data that would make signals @@ -2285,7 +2295,7 @@ { char const *signame = 0; - if (0 <= code && code < NSIG) + if (0 <= code && code < sys_siglist_entries) signame = sys_siglist[code]; if (! signame) signame = "Unknown signal"; === modified file 'src/syssignal.h' --- src/syssignal.h 2012-10-04 00:10:47 +0000 +++ src/syssignal.h 2012-10-07 02:26:03 +0000 @@ -43,7 +43,7 @@ typedef void (*signal_handler_t) (int); extern void emacs_sigaction_init (struct sigaction *, signal_handler_t); -char const *safe_strsignal (int); +char const *safe_strsignal (int) ATTRIBUTE_CONST; #if NSIG < NSIG_MINIMUM # undef NSIG ------------------------------------------------------------ revno: 110409 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 19:07:46 -0700 message: Remove tiny change marker for author with assignment diff: === modified file 'lisp/ChangeLog.15' --- lisp/ChangeLog.15 2012-05-29 06:16:49 +0000 +++ lisp/ChangeLog.15 2012-10-07 02:07:46 +0000 @@ -10962,7 +10962,7 @@ * Version 23.2 released. -2010-05-07 Deniz Dogan (tiny change) +2010-05-07 Deniz Dogan Stefan Monnier Highlight vendor specific properties. @@ -15541,7 +15541,7 @@ * window.el (move-to-window-line-last-op): Remove. (move-to-window-line-top-bottom): Reuse recenter-last-op instead. -2009-11-23 Deniz Dogan (tiny change) +2009-11-23 Deniz Dogan Make M-r mirror the new cycling behavior of C-l. * window.el (move-to-window-line-last-op): New var. === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2012-10-07 02:05:04 +0000 +++ lisp/erc/ChangeLog 2012-10-07 02:07:46 +0000 @@ -126,7 +126,7 @@ (erc-autojoin-after-ident): Ditto. (erc-autojoin-channels-alist): Mention auth-source. -2012-04-10 Deniz Dogan (tiny change) +2012-04-10 Deniz Dogan * erc.el (erc-display-prompt): Adds the field text property to the ERC prompt. This allows users to use `kill-whole-line' to kill ------------------------------------------------------------ revno: 110408 fixes bug: http://debbugs.gnu.org/11186 author: Deniz Dogan committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 19:05:04 -0700 message: * lisp/erc/erc-log.el (erc-generate-log-file-name-function): Clarify tags diff: === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2012-10-07 01:45:03 +0000 +++ lisp/erc/ChangeLog 2012-10-07 02:05:04 +0000 @@ -1,3 +1,8 @@ +2012-10-07 Deniz Dogan + + * erc-log.el (erc-generate-log-file-name-function): + Clarify tags for various choices. (Bug#11186) + 2012-10-07 Glenn Morris * erc-button.el (erc-button-alist): Remove "finger". (Bug#4443) === modified file 'lisp/erc/erc-log.el' --- lisp/erc/erc-log.el 2012-10-06 01:04:53 +0000 +++ lisp/erc/erc-log.el 2012-10-07 02:05:04 +0000 @@ -114,11 +114,13 @@ custom function which returns the directory part and set `erc-log-channels-directory' to its name." :group 'erc-log - :type '(choice (const :tag "Long style" erc-generate-log-file-name-long) - (const :tag "Long, but with network name rather than server" + :type '(choice (const :tag "#channel!nick server:port.txt" + erc-generate-log-file-name-long) + (const :tag "#channel!nick network.txt" erc-generate-log-file-name-network) - (const :tag "Short" erc-generate-log-file-name-short) - (const :tag "With date" erc-generate-log-file-name-with-date) + (const :tag "#channel.txt" erc-generate-log-file-name-short) + (const :tag "#channel date.txt" + erc-generate-log-file-name-with-date) (function :tag "Other function"))) (defcustom erc-truncate-buffer-on-save nil ------------------------------------------------------------ revno: 110407 fixes bug: http://debbugs.gnu.org/4443 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 18:45:03 -0700 message: * lisp/erc/erc-button.el (erc-button-alist): Remove "finger". diff: === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2012-10-07 01:41:03 +0000 +++ lisp/erc/ChangeLog 2012-10-07 01:45:03 +0000 @@ -1,3 +1,7 @@ +2012-10-07 Glenn Morris + + * erc-button.el (erc-button-alist): Remove "finger". (Bug#4443) + 2012-10-07 Antoine Levitt * erc-stamp.el (erc-format-timestamp): Don't apply intangible === modified file 'lisp/erc/erc-button.el' --- lisp/erc/erc-button.el 2012-10-06 01:04:53 +0000 +++ lisp/erc/erc-button.el 2012-10-07 01:45:03 +0000 @@ -135,7 +135,7 @@ '(('nicknames 0 erc-button-buttonize-nicks erc-nick-popup 0) (erc-button-url-regexp 0 t browse-url 0) (" ]+\\) *>" 0 t browse-url 1) - ("(\\(\\([^~\n \t@][^\n \t@]*\\)@\\([a-zA-Z0-9.:-]+\\)\\)" 1 t finger 2 3) +;;; ("(\\(\\([^~\n \t@][^\n \t@]*\\)@\\([a-zA-Z0-9.:-]+\\)\\)" 1 t finger 2 3) ;; emacs internal ("[`]\\([a-zA-Z][-a-zA-Z_0-9]+\\)[']" 1 t erc-button-describe-symbol 1) ;; pseudo links @@ -183,6 +183,7 @@ 'nicknames, these are ignored, and CALLBACK will be called with the nickname matched as the argument." :group 'erc-button + :version "24.3" ; remove finger (bug#4443) :type '(repeat (list :tag "Button" (choice :tag "Matches" ------------------------------------------------------------ revno: 110406 fixes bug: http://debbugs.gnu.org/11706 author: Antoine Levitt committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 18:41:03 -0700 message: Small fix for invisible timestamps * lisp/erc/erc-stamp.el (erc-format-timestamp): Don't apply intangible property to invisible stamps. diff: === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2012-10-07 01:28:04 +0000 +++ lisp/erc/ChangeLog 2012-10-07 01:41:03 +0000 @@ -1,3 +1,8 @@ +2012-10-07 Antoine Levitt + + * erc-stamp.el (erc-format-timestamp): Don't apply intangible + property to invisible stamps. (Bug#11706) + 2012-10-07 Glenn Morris * erc-backend.el (NICK): Handle pre-existing buffers. (Bug#12002) === modified file 'lisp/erc/erc-stamp.el' --- lisp/erc/erc-stamp.el 2012-10-06 01:04:53 +0000 +++ lisp/erc/erc-stamp.el 2012-10-07 01:41:03 +0000 @@ -353,8 +353,9 @@ 'isearch-open-invisible 'timestamp ts) ;; N.B. Later use categories instead of this harmless, but ;; inelegant, hack. -- BPT - (when erc-timestamp-intangible - (erc-put-text-property 0 (length ts) 'intangible t ts)) + (and erc-timestamp-intangible + (not erc-hide-timestamps) ; bug#11706 + (erc-put-text-property 0 (length ts) 'intangible t ts)) ts) "")) ------------------------------------------------------------ revno: 110405 fixes bug: http://debbugs.gnu.org/12002 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 18:28:04 -0700 message: * lisp/erc/erc-backend.el (NICK): Handle pre-existing buffers. diff: === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2012-10-06 20:30:26 +0000 +++ lisp/erc/ChangeLog 2012-10-07 01:28:04 +0000 @@ -1,3 +1,7 @@ +2012-10-07 Glenn Morris + + * erc-backend.el (NICK): Handle pre-existing buffers. (Bug#12002) + 2012-10-06 Glenn Morris * erc.el (erc-lurker): === modified file 'lisp/erc/erc-backend.el' --- lisp/erc/erc-backend.el 2012-10-06 01:04:53 +0000 +++ lisp/erc/erc-backend.el 2012-10-07 01:28:04 +0000 @@ -1316,7 +1316,7 @@ (when (equal (erc-default-target) nick) (setq erc-default-recipients (cons nn (cdr erc-default-recipients))) - (rename-buffer nn) + (rename-buffer nn t) ; bug#12002 (erc-update-mode-line) (add-to-list 'bufs (current-buffer))))) (erc-update-user-nick nick nn host nil nil login) ------------------------------------------------------------ revno: 110404 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 17:54:36 -0700 message: Improve cusver-check's handling of the version number * admin/admin.el (cusver-new-version): Set default. (cusver-check): Improve interactive argument reading. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-10-06 21:15:03 +0000 +++ admin/ChangeLog 2012-10-07 00:54:36 +0000 @@ -1,3 +1,8 @@ +2012-10-07 Glenn Morris + + * admin.el (cusver-new-version): Set default. + (cusver-check): Improve interactive argument reading. + 2012-10-06 Glenn Morris * admin.el (cusver-new-version): New variable. === modified file 'admin/admin.el' --- admin/admin.el 2012-10-06 21:15:03 +0000 +++ admin/admin.el 2012-10-07 00:54:36 +0000 @@ -442,8 +442,8 @@ )) "{}" "+")) -; FIXME Calculate default based on running emacs-version. -(defvar cusver-new-version nil +(defvar cusver-new-version (format "%s.%s" emacs-major-version + (1+ emacs-minor-version)) "Version number that new defcustoms should have.") ;; TODO do something about renamed variables with aliases to the old name? @@ -515,7 +515,11 @@ Note that a :version tag should also be added if the value of a defcustom changes (in a non-trivial way). This function does not check for that." - (interactive "DNew Lisp directory: \nDOld Lisp directory: \nsNew version number: ") + (interactive (list (read-directory-name "New Lisp directory: ") + (read-directory-name "Old Lisp directory: ") + (number-to-string + (read-number "New version number: " + (string-to-number cusver-new-version))))) (or (file-directory-p (setq newdir (expand-file-name newdir))) (error "Directory `%s' not found" newdir)) (or (file-directory-p (setq olddir (expand-file-name olddir))) ------------------------------------------------------------ revno: 110403 fixes bug: http://debbugs.gnu.org/7161 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 17:27:31 -0700 message: * lisp/hi-lock.el (hi-lock-process-phrase): Try to make it less fragile. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-07 00:07:03 +0000 +++ lisp/ChangeLog 2012-10-07 00:27:31 +0000 @@ -1,5 +1,8 @@ 2012-10-07 Glenn Morris + * hi-lock.el (hi-lock-process-phrase): + Try to make it less fragile. (Bug#7161) + * hi-lock.el (hi-lock-face-phrase-buffer): Doc fix. 2012-10-06 Glenn Morris === modified file 'lisp/hi-lock.el' --- lisp/hi-lock.el 2012-10-07 00:07:03 +0000 +++ lisp/hi-lock.el 2012-10-07 00:27:31 +0000 @@ -547,7 +547,11 @@ ;; FIXME fragile; better to just bind case-fold-search? (Bug#7161) (setq mod-phrase (replace-regexp-in-string - "\\<[a-z]" (lambda (m) (format "[%s%s]" (upcase m) m)) phrase)) + "\\(^\\|\\s-\\)\\([a-z]\\)" + (lambda (m) (format "%s[%s%s]" + (match-string 1 m) + (upcase (match-string 2 m)) + (match-string 2 m))) phrase)) ;; FIXME fragile; better to use search-spaces-regexp? (setq mod-phrase (replace-regexp-in-string ------------------------------------------------------------ revno: 110402 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 17:07:03 -0700 message: * lisp/hi-lock.el (hi-lock-face-phrase-buffer): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 23:22:52 +0000 +++ lisp/ChangeLog 2012-10-07 00:07:03 +0000 @@ -1,3 +1,7 @@ +2012-10-07 Glenn Morris + + * hi-lock.el (hi-lock-face-phrase-buffer): Doc fix. + 2012-10-06 Glenn Morris * ehelp.el (electric-help-mode): Use help-mode rather than === modified file 'lisp/hi-lock.el' --- lisp/hi-lock.el 2012-09-17 05:41:04 +0000 +++ lisp/hi-lock.el 2012-10-07 00:07:03 +0000 @@ -444,8 +444,8 @@ ;;;###autoload (defun hi-lock-face-phrase-buffer (regexp &optional face) "Set face of each match of phrase REGEXP to FACE. -Whitespace in REGEXP converted to arbitrary whitespace and initial -lower-case letters made case insensitive. +If called interactively, replaces whitespace in REGEXP with +arbitrary whitespace and makes initial lower-case letters case-insensitive. If Font Lock mode is enabled in the buffer, it is used to highlight REGEXP. If Font Lock mode is disabled, overlays are @@ -544,9 +544,11 @@ Blanks in PHRASE replaced by regexp that matches arbitrary whitespace and initial lower-case letters made case insensitive." (let ((mod-phrase nil)) + ;; FIXME fragile; better to just bind case-fold-search? (Bug#7161) (setq mod-phrase (replace-regexp-in-string "\\<[a-z]" (lambda (m) (format "[%s%s]" (upcase m) m)) phrase)) + ;; FIXME fragile; better to use search-spaces-regexp? (setq mod-phrase (replace-regexp-in-string "\\s-+" "[ \t\n]+" mod-phrase nil t)))) ------------------------------------------------------------ revno: 110401 fixes bug: http://debbugs.gnu.org/10917 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 16:22:52 -0700 message: * lisp/ehelp.el (electric-help-map): Use button-buffer-map. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 23:16:40 +0000 +++ lisp/ChangeLog 2012-10-06 23:22:52 +0000 @@ -1,7 +1,8 @@ 2012-10-06 Glenn Morris * ehelp.el (electric-help-mode): Use help-mode rather than - non-existent mode `help'. (Bug#10917) + non-existent mode `help'. + (electric-help-map): Use button-buffer-map. (Bug#10917) * textmodes/reftex-vars.el (reftex-create-bibtex-header) (reftex-create-bibtex-footer): Fix custom types. === modified file 'lisp/ehelp.el' --- lisp/ehelp.el 2012-10-06 23:16:40 +0000 +++ lisp/ehelp.el 2012-10-06 23:22:52 +0000 @@ -61,6 +61,8 @@ (defvar electric-help-map (let ((map (make-keymap))) + ;; FIXME fragile. Should derive from help-mode-map in a smarter way. + (set-keymap-parent map button-buffer-map) ;; allow all non-self-inserting keys - search, scroll, etc, but ;; let M-x and C-x exit ehelp mode and retain buffer: (suppress-keymap map) ------------------------------------------------------------ revno: 110400 fixes bug: http://debbugs.gnu.org/10917 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 16:16:40 -0700 message: * lisp/ehelp.el (electric-help-mode): Fix major-mode setting. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 22:52:52 +0000 +++ lisp/ChangeLog 2012-10-06 23:16:40 +0000 @@ -1,5 +1,8 @@ 2012-10-06 Glenn Morris + * ehelp.el (electric-help-mode): Use help-mode rather than + non-existent mode `help'. (Bug#10917) + * textmodes/reftex-vars.el (reftex-create-bibtex-header) (reftex-create-bibtex-footer): Fix custom types. === modified file 'lisp/ehelp.el' --- lisp/ehelp.el 2012-09-12 19:16:36 +0000 +++ lisp/ehelp.el 2012-10-06 23:16:40 +0000 @@ -102,7 +102,7 @@ (setq buffer-read-only t) (setq electric-help-orig-major-mode major-mode) (setq mode-name "Help") - (setq major-mode 'help) + (setq major-mode 'help-mode) (setq mode-line-buffer-identification '(" Help: %b")) (use-local-map electric-help-map) (add-hook 'mouse-leave-buffer-hook 'electric-help-retain) ------------------------------------------------------------ revno: 110399 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 15:52:52 -0700 message: Further ChangeLog fix diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 20:38:39 +0000 +++ lisp/ChangeLog 2012-10-06 22:52:52 +0000 @@ -1637,7 +1637,7 @@ register contains text. Implication is that `C-x r +' can now be used for appending to a text register (bug#12217). (append-to-register, prepend-to-register): Add separator based on - `register-separator. + `separator-register'. 2012-09-08 Alan Mackenzie ------------------------------------------------------------ revno: 110398 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 14:15:03 -0700 message: Handle group :version in cusver-check * admin/admin.el (cusver-new-version): New variable. (cusver-scan): Check if containing group has a :version. (cusver-check): Add VERSION argument. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-10-06 14:18:35 +0000 +++ admin/ChangeLog 2012-10-06 21:15:03 +0000 @@ -1,3 +1,9 @@ +2012-10-06 Glenn Morris + + * admin.el (cusver-new-version): New variable. + (cusver-scan): Check if containing group has a :version. + (cusver-check): Add VERSION argument. + 2012-10-01 David Engster * grammars/bovine-grammar.el: === modified file 'admin/admin.el' --- admin/admin.el 2012-09-27 06:45:38 +0000 +++ admin/admin.el 2012-10-06 21:15:03 +0000 @@ -442,8 +442,12 @@ )) "{}" "+")) -;; TODO if a defgroup with a version tag, apply to all customs in that -;; group (eg for new files). +; FIXME Calculate default based on running emacs-version. +(defvar cusver-new-version nil + "Version number that new defcustoms should have.") + +;; TODO do something about renamed variables with aliases to the old name? +;; Scan old cus-start.el to find variables moved from C to lisp? (defun cusver-scan (file &optional old) "Scan FILE for `defcustom' calls. Return a list with elements of the form (VAR . VER), @@ -452,8 +456,8 @@ If optional argument OLD is non-nil, also scan for defvars." (let ((m (format "Scanning %s..." file)) (re (format "^[ \t]*\\((def%s\\)[ \t\n]" - (if old "\\(?:custom\\|var\\)" "custom"))) - alist var ver form) + (if old "\\(custom\\|var\\)" "\\(custom\\|group\\)"))) + alist var ver form glist grp) (message "%s" m) (with-temp-buffer (insert-file-contents file) @@ -461,11 +465,23 @@ (while (re-search-forward re nil t) (goto-char (match-beginning 1)) (if (and (setq form (ignore-errors (read (current-buffer)))) - (setq var (car-safe (cdr-safe form))) + (setq var (car-safe (cdr-safe form))) ;; Exclude macros, eg (defcustom ,varname ...). (symbolp var)) - (setq ver (car (cdr-safe (memq :version form))) - alist (cons (cons var ver) alist)) + (progn + (setq ver (car (cdr-safe (memq :version form)))) + (if (equal "group" (match-string 2)) + ;; Group :version could be old. + (if (equal ver cusver-new-version) + (setq glist (cons (cons var ver) glist))) + ;; If it specifies a group and the whole group has a + ;; version. use that. + (unless ver + (setq grp (car (cdr-safe (memq :group form)))) + (and grp + (setq grp (car (cdr-safe grp))) ; (quote foo) -> foo + (setq ver (assq grp glist)))) + (setq alist (cons (cons var ver) alist)))) (if form (message "Malformed defcustom: `%s'" form))))) (message "%sdone" m) alist)) @@ -490,7 +506,7 @@ ;; TODO handle renamed things with aliases to the old names. ;; What to do about new files? Does everything in there need a :version, ;; or eg just the defgroup? -(defun cusver-check (newdir olddir) +(defun cusver-check (newdir olddir version) "Check that defcustoms have :version tags where needed. NEWDIR is the current lisp/ directory, OLDDIR is that from the previous release. A defcustom that is only in NEWDIR should have a :version @@ -499,11 +515,12 @@ Note that a :version tag should also be added if the value of a defcustom changes (in a non-trivial way). This function does not check for that." - (interactive "DNew Lisp directory: \nDOld Lisp directory: ") + (interactive "DNew Lisp directory: \nDOld Lisp directory: \nsNew version number: ") (or (file-directory-p (setq newdir (expand-file-name newdir))) (error "Directory `%s' not found" newdir)) (or (file-directory-p (setq olddir (expand-file-name olddir))) (error "Directory `%s' not found" olddir)) + (setq cusver-new-version version) (let* ((newfiles (progn (message "Finding new files with defcustoms...") (cusver-find-files newdir))) (oldfiles (progn (message "Finding old files with defcustoms...") ------------------------------------------------------------ revno: 110397 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 13:38:39 -0700 message: Fix some reftex custom types * lisp/textmodes/reftex-vars.el (reftex-create-bibtex-header) (reftex-create-bibtex-footer): Fix custom types. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 20:34:45 +0000 +++ lisp/ChangeLog 2012-10-06 20:38:39 +0000 @@ -1,5 +1,8 @@ 2012-10-06 Glenn Morris + * textmodes/reftex-vars.el (reftex-create-bibtex-header) + (reftex-create-bibtex-footer): Fix custom types. + * progmodes/sh-script.el (sh-indent-after-continuation): Add explicit :group. === modified file 'lisp/textmodes/reftex-vars.el' --- lisp/textmodes/reftex-vars.el 2012-10-06 20:30:26 +0000 +++ lisp/textmodes/reftex-vars.el 2012-10-06 20:38:39 +0000 @@ -1267,13 +1267,13 @@ "Header to insert in BibTeX files generated by RefTeX." :group 'reftex-citation-support :version "24.3" - :type 'string) + :type '(choice (const :tag "No header" nil) string)) (defcustom reftex-create-bibtex-footer nil "Footer to insert in BibTeX files generated by RefTeX." :group 'reftex-citation-support :version "24.3" - :type 'string) + :type '(choice (const :tag "No footer" nil) string)) ;; Index Support Configuration ------------------------------------------------------------ revno: 110396 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 13:34:45 -0700 message: * progmodes/sh-script.el (sh-indent-after-continuation): Add explicit :group. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 20:33:23 +0000 +++ lisp/ChangeLog 2012-10-06 20:34:45 +0000 @@ -1,5 +1,8 @@ 2012-10-06 Glenn Morris + * progmodes/sh-script.el (sh-indent-after-continuation): + Add explicit :group. + * textmodes/rst.el (rst-preferred-decorations) (rst-shift-basic-offset): Clarify obsolescence versions. === modified file 'lisp/progmodes/sh-script.el' --- lisp/progmodes/sh-script.el 2012-10-06 20:30:26 +0000 +++ lisp/progmodes/sh-script.el 2012-10-06 20:34:45 +0000 @@ -1768,7 +1768,8 @@ (defcustom sh-indent-after-continuation t "If non-nil, try to make sure text is indented after a line continuation." :version "24.3" - :type 'boolean) + :type 'boolean + :group 'sh-indentation) (defun sh-smie--continuation-start-indent () "Return the initial indentation of a continued line. ------------------------------------------------------------ revno: 110395 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 13:33:23 -0700 message: Clarify some rst.el obsolescence versions * lisp/textmodes/rst.el (rst-preferred-decorations) (rst-shift-basic-offset): Clarify obsolescence versions. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 20:30:26 +0000 +++ lisp/ChangeLog 2012-10-06 20:33:23 +0000 @@ -1,5 +1,8 @@ 2012-10-06 Glenn Morris + * textmodes/rst.el (rst-preferred-decorations) + (rst-shift-basic-offset): Clarify obsolescence versions. + * profiler.el (profiler): Add missing group :version tag. * avoid.el (mouse-avoidance-banish-position): * proced.el (proced-renice-command): === modified file 'lisp/textmodes/rst.el' --- lisp/textmodes/rst.el 2012-10-06 20:30:26 +0000 +++ lisp/textmodes/rst.el 2012-10-06 20:33:23 +0000 @@ -967,7 +967,7 @@ :version "21.1") (define-obsolete-variable-alias - 'rst-preferred-decorations 'rst-preferred-adornments "1.0.0") + 'rst-preferred-decorations 'rst-preferred-adornments "rst 1.0.0") (defcustom rst-preferred-adornments '((?= over-and-under 1) (?= simple 0) (?- simple 0) @@ -2836,7 +2836,7 @@ :package-version '(rst . "1.1.0")) (define-obsolete-variable-alias - 'rst-shift-basic-offset 'rst-indent-width "1.0.0") + 'rst-shift-basic-offset 'rst-indent-width "rst 1.0.0") (defcustom rst-indent-width 2 "Indentation when there is no more indentation point given." :group 'rst-indent ------------------------------------------------------------ revno: 110394 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 13:30:26 -0700 message: Add missing :version tags * profiler.el (profiler): Add missing group :version tag. * avoid.el (mouse-avoidance-banish-position): * proced.el (proced-renice-command): * calc/calc.el (calc-ensure-consistent-units): * calendar/icalendar.el (icalendar-import-format-uid): * net/tramp.el (tramp-save-ad-hoc-proxies): * progmodes/bug-reference.el (bug-reference-bug-regexp): * progmodes/flymake.el (flymake-error-bitmap) (flymake-warning-bitmap, flymake-fringe-indicator-position): * progmodes/sh-script.el (sh-indent-after-continuation): * progmodes/verilog-mode.el (verilog-auto-template-warn-unused) (verilog-before-save-font-hook, verilog-after-save-font-hook): * progmodes/vhdl-mode.el (vhdl-makefile-default-targets) (vhdl-array-index-record-field-in-sensitivity-list) (vhdl-indent-comment-like-next-code-line): * textmodes/reftex-vars.el (reftex-ref-style-alist) (reftex-ref-macro-prompt, reftex-ref-style-default-list) (reftex-cite-key-separator, reftex-create-bibtex-header) (reftex-create-bibtex-footer): * textmodes/rst.el (rst-new-adornment-down, rst-indent-field) (rst-indent-literal-normal, rst-indent-literal-minimized) (rst-indent-comment): Add missing custom :version tags. * cedet/semantic/complete.el (semantic-displayor-tooltip-mode) (semantic-displayor-tooltip-initial-max-tags) (semantic-displayor-tooltip-max-tags): Add missing custom :version tags. * cedet/ede/linux.el (project-linux): Add missing group :version tag. * cedet/semantic/complete.el (semantic-displayor-tooltip-max-tags): Doc fix. * erc/erc.el (erc-lurker): * erc/erc-desktop-notifications.el (erc-notifications): Add missing group :version tags. * gnus/gnus-notifications.el (gnus-notifications): Add missing group :version tag. * gnus/gnus-msg.el (gnus-gcc-pre-body-encode-hook) (gnus-gcc-post-body-encode-hook): * gnus/gnus-sync.el (gnus-sync-lesync-name) (gnus-sync-lesync-install-topics): Add missing custom :version tags. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 20:05:39 +0000 +++ lisp/ChangeLog 2012-10-06 20:30:26 +0000 @@ -1,5 +1,28 @@ 2012-10-06 Glenn Morris + * profiler.el (profiler): Add missing group :version tag. + * avoid.el (mouse-avoidance-banish-position): + * proced.el (proced-renice-command): + * calc/calc.el (calc-ensure-consistent-units): + * calendar/icalendar.el (icalendar-import-format-uid): + * net/tramp.el (tramp-save-ad-hoc-proxies): + * progmodes/bug-reference.el (bug-reference-bug-regexp): + * progmodes/flymake.el (flymake-error-bitmap) + (flymake-warning-bitmap, flymake-fringe-indicator-position): + * progmodes/sh-script.el (sh-indent-after-continuation): + * progmodes/verilog-mode.el (verilog-auto-template-warn-unused) + (verilog-before-save-font-hook, verilog-after-save-font-hook): + * progmodes/vhdl-mode.el (vhdl-makefile-default-targets) + (vhdl-array-index-record-field-in-sensitivity-list) + (vhdl-indent-comment-like-next-code-line): + * textmodes/reftex-vars.el (reftex-ref-style-alist) + (reftex-ref-macro-prompt, reftex-ref-style-default-list) + (reftex-cite-key-separator, reftex-create-bibtex-header) + (reftex-create-bibtex-footer): + * textmodes/rst.el (rst-new-adornment-down, rst-indent-field) + (rst-indent-literal-normal, rst-indent-literal-minimized) + (rst-indent-comment): Add missing custom :version tags. + * calendar/timeclock.el (timeclock-modeline-display): Add missing obsolete alias for renamed user option. === modified file 'lisp/avoid.el' --- lisp/avoid.el 2012-07-10 11:51:54 +0000 +++ lisp/avoid.el 2012-10-06 20:30:26 +0000 @@ -128,6 +128,7 @@ TOP-OR-BOTTOM: banish the mouse to top or bottom of frame or window. TOP-OR-BOTTOM-POS: Distance from top or bottom edge of frame or window." :group 'avoid + :version "24.3" :type '(alist :key-type symbol :value-type symbol) :options '(frame-or-window side (side-pos integer) top-or-bottom (top-or-bottom-pos integer))) === modified file 'lisp/calc/calc.el' --- lisp/calc/calc.el 2012-09-20 13:44:45 +0000 +++ lisp/calc/calc.el 2012-10-06 20:30:26 +0000 @@ -423,6 +423,7 @@ "If non-nil, make sure new units are consistent with current units when converting units." :group 'calc + :version "24.3" :type 'boolean) (defcustom calc-undo-length === modified file 'lisp/calendar/icalendar.el' --- lisp/calendar/icalendar.el 2012-09-25 04:13:02 +0000 +++ lisp/calendar/icalendar.el 2012-10-06 20:30:26 +0000 @@ -186,6 +186,7 @@ This applies only if the UID is not empty! `%s' is replaced by the UID." :type 'string + :version "24.3" :group 'icalendar) (defcustom icalendar-import-format-status === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2012-10-06 14:18:35 +0000 +++ lisp/cedet/ChangeLog 2012-10-06 20:30:26 +0000 @@ -1,3 +1,12 @@ +2012-10-06 Glenn Morris + + * semantic/complete.el (semantic-displayor-tooltip-max-tags): Doc fix. + + * semantic/complete.el (semantic-displayor-tooltip-mode) + (semantic-displayor-tooltip-initial-max-tags) + (semantic-displayor-tooltip-max-tags): Add missing custom :version tags. + * ede/linux.el (project-linux): Add missing group :version tag. + 2012-10-06 Chong Yidong * semantic/bovine/grammar.el: === modified file 'lisp/cedet/ede/linux.el' --- lisp/cedet/ede/linux.el 2012-10-01 18:10:29 +0000 +++ lisp/cedet/ede/linux.el 2012-10-06 20:30:26 +0000 @@ -44,7 +44,7 @@ "File and tag browser frame." :group 'tools :group 'ede - ) + :version "24.3") (defcustom project-linux-compile-target-command (concat ede-make-command " -k -C %s SUBDIRS=%s") "*Default command used to compile a target." === modified file 'lisp/cedet/semantic/complete.el' --- lisp/cedet/semantic/complete.el 2012-10-05 05:57:24 +0000 +++ lisp/cedet/semantic/complete.el 2012-10-06 20:30:26 +0000 @@ -1564,6 +1564,7 @@ The absolute maximum number of completions for all mode is determined through `semantic-displayor-tooltip-max-tags'." :group 'semantic + :version "24.3" :type '(choice (const :tag "Standard" standard) (const :tag "Quiet" quiet) (const :tag "Verbose" verbose))) @@ -1573,24 +1574,25 @@ "Maximum number of tags to be displayed initially. See doc-string of `semantic-displayor-tooltip-mode' for details." :group 'semantic + :version "24.3" :type 'integer) (defcustom semantic-displayor-tooltip-max-tags 25 - "The maximum number of tags to be displayed. + "The maximum number of tags to be displayed. Maximum number of completions where we have activated the extended completion list through typing TAB or SPACE multiple times. This limit needs to fit on your screen! Note: If available, customizing this variable increases -'x-max-tooltip-size' to force over-sized tooltips when necessary. -This will not happen if you directly set this variable via -`setq'." - :group 'semantic - :type 'integer - :set '(lambda (sym var) - (set-default sym var) - (when (boundp 'x-max-tooltip-size) - (setcdr x-max-tooltip-size (max (1+ var) (cdr x-max-tooltip-size)))))) +`x-max-tooltip-size' to force over-sized tooltips when necessary. +This will not happen if you directly set this variable via `setq'." + :group 'semantic + :version "24.3" + :type 'integer + :set '(lambda (sym var) + (set-default sym var) + (when (boundp 'x-max-tooltip-size) + (setcdr x-max-tooltip-size (max (1+ var) (cdr x-max-tooltip-size)))))) (defclass semantic-displayor-tooltip (semantic-displayor-traditional) === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2012-10-04 13:11:49 +0000 +++ lisp/erc/ChangeLog 2012-10-06 20:30:26 +0000 @@ -1,3 +1,9 @@ +2012-10-06 Glenn Morris + + * erc.el (erc-lurker): + * erc-desktop-notifications.el (erc-notifications): + Add missing group :version tags. + 2012-10-04 Julien Danjou * erc-desktop-notifications.el: Rename from erc-notifications to @@ -9,8 +15,7 @@ 2012-09-17 Chong Yidong - * erc-page.el (erc-page-function): - + * erc-page.el (erc-page-function): * erc-stamp.el (erc-stamp): Doc fix. 2012-08-21 Josh Feinstein === modified file 'lisp/erc/erc-desktop-notifications.el' --- lisp/erc/erc-desktop-notifications.el 2012-10-04 13:11:49 +0000 +++ lisp/erc/erc-desktop-notifications.el 2012-10-06 20:30:26 +0000 @@ -35,6 +35,7 @@ (defgroup erc-notifications nil "Send notifications on PRIVMSG or mentions." + :version "24.3" :group 'erc) (defvar erc-notifications-last-notification nil === modified file 'lisp/erc/erc.el' --- lisp/erc/erc.el 2012-10-06 01:04:53 +0000 +++ lisp/erc/erc.el 2012-10-06 20:30:26 +0000 @@ -102,6 +102,7 @@ (defgroup erc-lurker nil "Hide specified message types sent by lurkers" + :version "24.3" :group 'erc-ignore) (defgroup erc-query nil === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-09-25 23:39:44 +0000 +++ lisp/gnus/ChangeLog 2012-10-06 20:30:26 +0000 @@ -1,3 +1,12 @@ +2012-10-06 Glenn Morris + + * gnus-notifications.el (gnus-notifications): + Add missing group :version tag. + * gnus-msg.el (gnus-gcc-pre-body-encode-hook) + (gnus-gcc-post-body-encode-hook): + * gnus-sync.el (gnus-sync-lesync-name) + (gnus-sync-lesync-install-topics): Add missing custom :version tags. + 2012-09-25 Katsumi Yamaoka * gnus-art.el (gnus-article-browse-delete-temp-files): Never ask again === modified file 'lisp/gnus/gnus-msg.el' --- lisp/gnus/gnus-msg.el 2012-08-22 10:37:55 +0000 +++ lisp/gnus/gnus-msg.el 2012-10-06 20:30:26 +0000 @@ -319,6 +319,7 @@ including the message header. Changes made to the message will only affect the Gcc copy, but not the original message." :group 'gnus-message + :version "24.3" :type 'hook) (defcustom gnus-gcc-post-body-encode-hook nil @@ -327,6 +328,7 @@ including the message header. Changes made to the message will only affect the Gcc copy, but not the original message." :group 'gnus-message + :version "24.3" :type 'hook) (autoload 'gnus-message-citation-mode "gnus-cite" nil t) === modified file 'lisp/gnus/gnus-notifications.el' --- lisp/gnus/gnus-notifications.el 2012-09-11 10:08:59 +0000 +++ lisp/gnus/gnus-notifications.el 2012-10-06 20:30:26 +0000 @@ -42,6 +42,7 @@ (defgroup gnus-notifications nil "Send notifications on new message in Gnus." + :version "24.3" :group 'gnus) (defcustom gnus-notifications-use-google-contacts t === modified file 'lisp/gnus/gnus-sync.el' --- lisp/gnus/gnus-sync.el 2012-09-01 01:04:26 +0000 +++ lisp/gnus/gnus-sync.el 2012-10-06 20:30:26 +0000 @@ -134,11 +134,13 @@ (defcustom gnus-sync-lesync-name (system-name) "The LeSync name for this machine." :group 'gnus-sync + :version "24.3" :type 'string) -(defcustom gnus-sync-lesync-install-topics 'ask +(defcustom gnus-sync-lesync-install-topics 'ask "Should LeSync install the recorded topics?" :group 'gnus-sync + :version "24.3" :type '(choice (const :tag "Never Install" nil) (const :tag "Always Install" t) (const :tag "Ask Me Once" ask))) === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2012-09-12 16:36:25 +0000 +++ lisp/net/tramp.el 2012-10-06 20:30:26 +0000 @@ -403,6 +403,7 @@ (defcustom tramp-save-ad-hoc-proxies nil "Whether to save ad-hoc proxies persistently." :group 'tramp + :version "24.3" :type 'boolean) (defcustom tramp-restricted-shell-hosts-alist === modified file 'lisp/proced.el' --- lisp/proced.el 2012-10-05 05:57:24 +0000 +++ lisp/proced.el 2012-10-06 20:30:26 +0000 @@ -68,6 +68,7 @@ (defcustom proced-renice-command "renice" "Name of renice command." :group 'proced + :version "24.3" :type '(string :tag "command")) (defcustom proced-signal-list === modified file 'lisp/profiler.el' --- lisp/profiler.el 2012-10-05 05:57:24 +0000 +++ lisp/profiler.el 2012-10-06 20:30:26 +0000 @@ -29,6 +29,7 @@ (defgroup profiler nil "Emacs profiler." :group 'lisp + :version "24.3" :prefix "profiler-") (defconst profiler-version "24.3") === modified file 'lisp/progmodes/bug-reference.el' --- lisp/progmodes/bug-reference.el 2012-08-22 06:47:00 +0000 +++ lisp/progmodes/bug-reference.el 2012-10-06 20:30:26 +0000 @@ -74,6 +74,7 @@ The second subexpression should match the bug reference (usually a number)." :type 'string :safe 'stringp + :version "24.3" ; previously defconst :group 'bug-reference) (defun bug-reference-set-overlay-properties () === modified file 'lisp/progmodes/flymake.el' --- lisp/progmodes/flymake.el 2012-09-05 07:05:56 +0000 +++ lisp/progmodes/flymake.el 2012-10-06 20:30:26 +0000 @@ -768,6 +768,7 @@ The value may also be a list of two elements where the second element specifies the face for the bitmap." :group 'flymake + :version "24.3" :type 'symbol) (defcustom flymake-warning-bitmap 'question-mark @@ -775,6 +776,7 @@ The value may also be a list of two elements where the second element specifies the face for the bitmap." :group 'flymake + :version "24.3" :type 'symbol) (defcustom flymake-fringe-indicator-position 'left-fringe @@ -782,6 +784,7 @@ The value can be nil, left-fringe or right-fringe. Fringe indicators are disabled if nil." :group 'flymake + :version "24.3" :type '(choice (const left-fringe) (const right-fringe) (const :tag "No fringe indicators" nil))) === modified file 'lisp/progmodes/sh-script.el' --- lisp/progmodes/sh-script.el 2012-09-25 04:13:02 +0000 +++ lisp/progmodes/sh-script.el 2012-10-06 20:30:26 +0000 @@ -1767,6 +1767,7 @@ (defcustom sh-indent-after-continuation t "If non-nil, try to make sure text is indented after a line continuation." + :version "24.3" :type 'boolean) (defun sh-smie--continuation-start-indent () === modified file 'lisp/progmodes/verilog-mode.el' --- lisp/progmodes/verilog-mode.el 2012-10-05 05:57:24 +0000 +++ lisp/progmodes/verilog-mode.el 2012-10-06 20:30:26 +0000 @@ -1159,6 +1159,7 @@ "Non-nil means report warning if an AUTO_TEMPLATE line is not used. This feature is not supported before Emacs 21.1 or XEmacs 21.4." :group 'verilog-mode-auto + :version "24.3" :type 'boolean) (put 'verilog-auto-template-warn-unused 'safe-local-variable 'verilog-booleanp) @@ -1230,11 +1231,13 @@ (defcustom verilog-before-save-font-hook nil "Hook run before `verilog-save-font-mods' removes highlighting." :group 'verilog-mode-auto + :version "24.3" :type 'hook) (defcustom verilog-after-save-font-hook nil "Hook run after `verilog-save-font-mods' restores highlighting." :group 'verilog-mode-auto + :version "24.3" :type 'hook) (defvar verilog-imenu-generic-expression === modified file 'lisp/progmodes/vhdl-mode.el' --- lisp/progmodes/vhdl-mode.el 2012-09-29 18:15:57 +0000 +++ lisp/progmodes/vhdl-mode.el 2012-10-06 20:30:26 +0000 @@ -483,6 +483,7 @@ :type '(list (string :tag "Compile entire design") (string :tag "Clean entire design ") (string :tag "Create design library")) + :version "24.3" :group 'vhdl-compile) (defcustom vhdl-makefile-generation-hook nil @@ -772,6 +773,7 @@ the sensitivity list (e.g. \"in1(0)\", \"in2.f0\"). Otherwise, only the record name is included (e.g. \"in1\", \"in2\")." :type 'boolean + :version "24.3" :group 'vhdl-style) (defgroup vhdl-naming nil @@ -1849,6 +1851,7 @@ Indenting comment lines like the following code line gives nicer indentation when comments precede the code that they refer to." :type 'boolean + :version "24.3" :group 'vhdl-misc) (defcustom vhdl-word-completion-case-sensitive nil === modified file 'lisp/textmodes/reftex-vars.el' --- lisp/textmodes/reftex-vars.el 2012-09-30 20:30:13 +0000 +++ lisp/textmodes/reftex-vars.el 2012-10-06 20:30:26 +0000 @@ -968,6 +968,7 @@ `reftex-ref-macro-prompt'.) The keys, represented as characters, have to be unique." :group 'reftex-referencing-labels + :version "24.3" :type '(alist :key-type (string :tag "Style name") :value-type (group (choice :tag "Package" (const :tag "Any package" t) @@ -979,6 +980,7 @@ (defcustom reftex-ref-macro-prompt t "If non-nil, `reftex-reference' prompts for the reference macro." :group 'reftex-referencing-labels + :version "24.3" :type 'boolean) (defcustom reftex-vref-is-default nil @@ -1014,6 +1016,7 @@ in the list have to match the respective reference style names used in the variable `reftex-ref-style-alist'." :group 'reftex-referencing-labels + :version "24.3" :type `(set ,@(mapcar (lambda (x) (list 'const (car x))) reftex-ref-style-alist))) @@ -1257,16 +1260,19 @@ (defcustom reftex-cite-key-separator "," "String to be used for separating several keys in a \\cite macro." :group 'reftex-citation-support + :version "24.3" :type 'string) (defcustom reftex-create-bibtex-header nil "Header to insert in BibTeX files generated by RefTeX." :group 'reftex-citation-support + :version "24.3" :type 'string) (defcustom reftex-create-bibtex-footer nil "Footer to insert in BibTeX files generated by RefTeX." :group 'reftex-citation-support + :version "24.3" :type 'string) ;; Index Support Configuration === modified file 'lisp/textmodes/rst.el' --- lisp/textmodes/rst.el 2012-09-23 14:50:02 +0000 +++ lisp/textmodes/rst.el 2012-10-06 20:30:26 +0000 @@ -1545,6 +1545,7 @@ :type '(choice (const :tag "Same level as previous one" nil) (const :tag "One level down relative to the previous one" t)) + :version "24.3" :package-version '(rst . "1.1.0")) (rst-testcover-defcustom) @@ -2845,24 +2846,28 @@ (defcustom rst-indent-field 3 "Indentation for first line after a field or 0 to always indent for content." :group 'rst-indent + :version "24.3" :type '(integer)) (rst-testcover-defcustom) (defcustom rst-indent-literal-normal 3 "Default indentation for literal block after a markup on an own line." :group 'rst-indent + :version "24.3" :type '(integer)) (rst-testcover-defcustom) (defcustom rst-indent-literal-minimized 2 "Default indentation for literal block after a minimized markup." :group 'rst-indent + :version "24.3" :type '(integer)) (rst-testcover-defcustom) (defcustom rst-indent-comment 3 "Default indentation for first line of a comment." :group 'rst-indent + :version "24.3" :type '(integer)) (rst-testcover-defcustom) ------------------------------------------------------------ revno: 110393 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 13:05:39 -0700 message: * timeclock.el (timeclock-modeline-display): Add missing obsolete alias diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 19:55:47 +0000 +++ lisp/ChangeLog 2012-10-06 20:05:39 +0000 @@ -1,5 +1,8 @@ 2012-10-06 Glenn Morris + * calendar/timeclock.el (timeclock-modeline-display): + Add missing obsolete alias for renamed user option. + * strokes.el (strokes-modeline-string): * emulation/crisp.el (crisp-mode-modeline-string): * eshell/esh-mode.el (eshell-status-in-modeline): === modified file 'lisp/calendar/timeclock.el' --- lisp/calendar/timeclock.el 2012-09-17 05:41:04 +0000 +++ lisp/calendar/timeclock.el 2012-10-06 20:05:39 +0000 @@ -321,6 +321,9 @@ (force-mode-line-update) (setq timeclock-mode-line-display on-p))) +(define-obsolete-variable-alias 'timeclock-modeline-display + 'timeclock-mode-line-display "24.3") + ;; This has to be here so that the function definition of ;; `timeclock-mode-line-display' is known to the "set" function. (defcustom timeclock-mode-line-display nil ------------------------------------------------------------ revno: 110392 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 12:55:47 -0700 message: Aliases to defcustoms must come before the defcustom. * strokes.el (strokes-modeline-string): * emulation/crisp.el (crisp-mode-modeline-string): * eshell/esh-mode.el (eshell-status-in-modeline): Aliases to defcustoms must come before the defcustom. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 19:50:29 +0000 +++ lisp/ChangeLog 2012-10-06 19:55:47 +0000 @@ -1,5 +1,10 @@ 2012-10-06 Glenn Morris + * strokes.el (strokes-modeline-string): + * emulation/crisp.el (crisp-mode-modeline-string): + * eshell/esh-mode.el (eshell-status-in-modeline): + Aliases to defcustoms must come before the defcustom. + * calendar/cal-tex.el (cal-tex-diary, cal-tex-cursor-week) (cal-tex-cursor-week2, cal-tex-cursor-week-iso) (cal-tex-cursor-week-monday): Doc fixes. === modified file 'lisp/emulation/crisp.el' --- lisp/emulation/crisp.el 2012-08-15 16:29:11 +0000 +++ lisp/emulation/crisp.el 2012-10-06 19:55:47 +0000 @@ -171,14 +171,14 @@ All the bindings are done here instead of globally to try and be nice to the world.") +(define-obsolete-variable-alias 'crisp-mode-modeline-string + 'crisp-mode-mode-line-string "24.3") + (defcustom crisp-mode-mode-line-string " *CRiSP*" "String to display in the mode line when CRiSP emulation mode is enabled." :type 'string :group 'crisp) -(define-obsolete-variable-alias 'crisp-mode-modeline-string - 'crisp-mode-mode-line-string "24.3") - ;;;###autoload (defcustom crisp-mode nil "Track status of CRiSP emulation mode. === modified file 'lisp/eshell/esh-mode.el' --- lisp/eshell/esh-mode.el 2012-08-15 16:29:11 +0000 +++ lisp/eshell/esh-mode.el 2012-10-06 19:55:47 +0000 @@ -193,14 +193,14 @@ :type '(choice (const nil) function) :group 'eshell-mode) +(define-obsolete-variable-alias 'eshell-status-in-modeline + 'eshell-status-in-mode-line "24.3") + (defcustom eshell-status-in-mode-line t "If non-nil, let the user know a command is running in the mode line." :type 'boolean :group 'eshell-mode) -(define-obsolete-variable-alias 'eshell-status-in-modeline - 'eshell-status-in-mode-line "24.3") - (defvar eshell-first-time-p t "A variable which is non-nil the first time Eshell is loaded.") === modified file 'lisp/strokes.el' --- lisp/strokes.el 2012-09-17 05:41:04 +0000 +++ lisp/strokes.el 2012-10-06 19:55:47 +0000 @@ -212,13 +212,14 @@ :link '(emacs-commentary-link "strokes") :group 'mouse) +(define-obsolete-variable-alias 'strokes-modeline-string 'strokes-lighter + "24.3") + (defcustom strokes-lighter " Strokes" "Mode line identifier for Strokes mode." :type 'string :group 'strokes) -(define-obsolete-variable-alias 'strokes-modeline-string 'strokes-lighter "24.3") - (defcustom strokes-character ?@ "Character used when drawing strokes in the strokes buffer. \(The default is `@', which works well.\)" ------------------------------------------------------------ revno: 110391 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 12:50:29 -0700 message: ChangeLog fix diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 18:34:23 +0000 +++ lisp/ChangeLog 2012-10-06 19:50:29 +0000 @@ -1592,7 +1592,7 @@ 2012-09-08 Jambunathan K * register.el (register): New group. - (register-separator): New user option. + (separator-register): New user option. (increment-register): Route it to `append-to-register', if register contains text. Implication is that `C-x r +' can now be used for appending to a text register (bug#12217). ------------------------------------------------------------ revno: 110390 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 11:34:23 -0700 message: Rename a new cal-tex function, document it * lisp/calendar/cal-tex.el (cal-tex-diary, cal-tex-cursor-week) (cal-tex-cursor-week2, cal-tex-cursor-week-iso) (cal-tex-cursor-week-monday): Doc fixes. (cal-tex-cursor-week2-summary): Doc fix. Rename from cal-tex-cursor-week-at-a-glance. * lisp/calendar/calendar.el (calendar-mode-map): Add cal-tex-cursor-week2-summary. * lisp/calendar/cal-menu.el (cal-menu-context-mouse-menu): Tweak week descriptions. Add cal-tex-cursor-week2-summary. * doc/emacs/calendar.texi (Writing Calendar Files): Tweak week descriptions. Mention cal-tex-cursor-week2-summary. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-10-06 14:18:03 +0000 +++ doc/emacs/ChangeLog 2012-10-06 18:34:23 +0000 @@ -1,3 +1,8 @@ +2012-10-06 Glenn Morris + + * calendar.texi (Writing Calendar Files): Tweak week descriptions. + Mention cal-tex-cursor-week2-summary. + 2012-10-06 Chong Yidong * mini.texi (Passwords): Fix typo. === modified file 'doc/emacs/calendar.texi' --- doc/emacs/calendar.texi 2012-06-17 05:13:40 +0000 +++ doc/emacs/calendar.texi 2012-10-06 18:34:23 +0000 @@ -396,17 +396,20 @@ Generate a one-day calendar (@code{cal-tex-cursor-day}). @item t w 1 -Generate a one-page calendar for one week +Generate a one-page calendar for one week, with hours (@code{cal-tex-cursor-week}). @item t w 2 -Generate a two-page calendar for one week +Generate a two-page calendar for one week, with hours (@code{cal-tex-cursor-week2}). @item t w 3 -Generate an ISO-style calendar for one week +Generate an ISO-style calendar for one week, without hours (@code{cal-tex-cursor-week-iso}). @item t w 4 -Generate a calendar for one Monday-starting week +Generate a calendar for one Monday-starting week, with hours (@code{cal-tex-cursor-week-monday}). +@item t w W +Generate a two-page calendar for one week, without hours +(@code{cal-tex-cursor-week2-summary}). @item t f w Generate a Filofax-style two-weeks-at-a-glance calendar (@code{cal-tex-cursor-filofax-2week}). === modified file 'etc/NEWS' --- etc/NEWS 2012-10-04 19:28:11 +0000 +++ etc/NEWS 2012-10-06 18:34:23 +0000 @@ -281,6 +281,9 @@ *** You can customize the header text that appears above each calendar month. See the variable `calendar-month-header'. ++++ +*** New LaTeX calendar style, produced by `cal-tex-cursor-week2-summary'. + *** The calendars produced by cal-html include holidays. Customize cal-html-holidays to change this. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 17:34:57 +0000 +++ lisp/ChangeLog 2012-10-06 18:34:23 +0000 @@ -1,3 +1,17 @@ +2012-10-06 Glenn Morris + + * calendar/cal-tex.el (cal-tex-diary, cal-tex-cursor-week) + (cal-tex-cursor-week2, cal-tex-cursor-week-iso) + (cal-tex-cursor-week-monday): Doc fixes. + (cal-tex-cursor-week2-summary): Doc fix. + Rename from cal-tex-cursor-week-at-a-glance. + + * calendar/cal-menu.el (cal-menu-context-mouse-menu): + Tweak week descriptions. Add cal-tex-cursor-week2-summary. + + * calendar/calendar.el (calendar-mode-map): + Add cal-tex-cursor-week2-summary. + 2012-10-06 Stefan Monnier * emacs-lisp/cl-macs.el (cl-defstruct): Improve docstring. === modified file 'lisp/calendar/cal-menu.el' --- lisp/calendar/cal-menu.el 2012-02-18 03:08:15 +0000 +++ lisp/calendar/cal-menu.el 2012-10-06 18:34:23 +0000 @@ -237,10 +237,11 @@ ;; These did not work if called without calendar window selected. ("Prepare LaTeX buffer" ["Daily (1 page)" cal-tex-cursor-day] - ["Weekly (1 page)" cal-tex-cursor-week] - ["Weekly (2 pages)" cal-tex-cursor-week2] - ["Weekly (other style; 1 page)" cal-tex-cursor-week-iso] - ["Weekly (yet another style; 1 page)" cal-tex-cursor-week-monday] + ["Weekly (1 page, with hours)" cal-tex-cursor-week] + ["Weekly (2 pages, with hours)" cal-tex-cursor-week2] + ["Weekly (1 page, no hours)" cal-tex-cursor-week-iso] + ["Weekly (1 page, with hours, different style)" cal-tex-cursor-week-monday] + ["Weekly (2 pages, no hours)" cal-tex-cursor-week2-summary] ["Monthly" cal-tex-cursor-month] ["Monthly (landscape)" cal-tex-cursor-month-landscape] ["Yearly" cal-tex-cursor-year] === modified file 'lisp/calendar/cal-tex.el' --- lisp/calendar/cal-tex.el 2012-09-27 06:47:12 +0000 +++ lisp/calendar/cal-tex.el 2012-10-06 18:34:23 +0000 @@ -37,6 +37,7 @@ ;; cal-tex-cursor-month ;; cal-tex-cursor-week ;; cal-tex-cursor-week2 +;; cal-tex-cursor-week2-summary ;; cal-tex-cursor-week-iso ;; cal-tex-cursor-week-monday ;; cal-tex-cursor-filofax-2week @@ -82,8 +83,6 @@ (defcustom cal-tex-diary nil "Non-nil means diary entries are printed in LaTeX calendars that support it. -At present, this only affects the monthly, filofax, and iso-week -calendars (i.e. not the yearly, plain weekly, or daily calendars). Setting this to nil may speed up calendar generation." :type 'boolean :group 'calendar-tex) @@ -717,11 +716,15 @@ ;; TODO respect cal-tex-daily-start,end (see cal-tex-week-hours). ;;;###cal-autoload (defun cal-tex-cursor-week (&optional n event) - "Make a LaTeX calendar buffer for a two-page one-week calendar. -It applies to the week that point is in. The optional prefix -argument N specifies number of weeks (default 1). The calendar -shows holidays if `cal-tex-holidays' is non-nil (note that diary -entries are not shown). The calendar shows the hours 8-12am, 1-5pm." + "Make a one page LaTeX calendar for one week, showing hours of the day. +There are two columns; with 8-12am in the first and 1-5pm in the second. +It shows holidays if `cal-tex-holidays' is non-nil. +It does not show diary entries. + +The optional prefix argument N specifies a number of weeks (default 1). + +By default, the calendar is for the week at point; the optional +argument EVENT specifies a different buffer position." (interactive (list (prefix-numeric-value current-prefix-arg) last-nonmenu-event)) (or n (setq n 1)) @@ -768,12 +771,15 @@ ;; TODO respect cal-tex-daily-start,end (see cal-tex-week-hours). ;;;###cal-autoload (defun cal-tex-cursor-week2 (&optional n event) - "Make a LaTeX calendar buffer for a two-page one-week calendar. -It applies to the week that point is in. Optional prefix -argument N specifies number of weeks (default 1). The calendar -shows holidays if `cal-tex-holidays' is non-nil (note that diary -entries are not shown). The calendar shows the hours 8-12am, 1-5pm. -Optional EVENT indicates a buffer position to use instead of point." + "Make a two page LaTeX calendar for one week, showing hours of the day. +There are two columns; with 8-12am in the first and 1-5pm in the second. +It shows holidays if `cal-tex-holidays' is non-nil. +It does not show diary entries. + +The optional prefix argument N specifies a number of weeks (default 1). + +By default, the calendar is for the week at point; the optional +argument EVENT specifies a different buffer position." (interactive (list (prefix-numeric-value current-prefix-arg) last-nonmenu-event)) (or n (setq n 1)) @@ -848,12 +854,15 @@ ;;;###cal-autoload (defun cal-tex-cursor-week-iso (&optional n event) - "Make a LaTeX calendar buffer for a one page ISO-style weekly calendar. -Optional prefix argument N specifies number of weeks (default 1). -The calendar shows holiday and diary entries if -`cal-tex-holidays' and `cal-tex-diary', respectively, are non-nil. -It does not show hours of the day. Optional EVENT indicates a buffer -position to use instead of point." + "Make a one page LaTeX calendar for one week, in the ISO-style. +It does not show hours of the day. +It shows holidays if `cal-tex-holidays' is non-nil. +It shows diary entries if `cal-tex-diary' is non-nil. + +The optional prefix argument N specifies a number of weeks (default 1). + +By default, the calendar is for the week at point; the optional +argument EVENT specifies a different buffer position." (interactive (list (prefix-numeric-value current-prefix-arg) last-nonmenu-event)) (or n (setq n 1)) @@ -976,13 +985,16 @@ ;; TODO respect cal-tex-daily-start,end (see cal-tex-weekly4-box). ;;;###cal-autoload (defun cal-tex-cursor-week-monday (&optional n event) - "Make a LaTeX calendar buffer for a two-page one-week calendar. -It applies to the week that point is in, and starts on Monday. -Optional prefix argument N specifies number of weeks (default 1). -The calendar shows holidays if `cal-tex-holidays' is -non-nil (note that diary entries are not shown). The calendar shows -the hours 8-12am, 1-5pm. Optional EVENT indicates a buffer position -to use instead of point." + "Make a one page LaTeX calendar for one week, showing hours of the day. +There are two columns; with M-W in the first and T-S in the second. +It shows the hours 8-12am and 1-5pm. +It shows holidays if `cal-tex-holidays' is non-nil. +It does not show diary entries. + +The optional prefix argument N specifies a number of weeks (default 1). + +By default, the calendar is for the week at point; the optional +argument EVENT specifies a different buffer position." (interactive (list (prefix-numeric-value current-prefix-arg) last-nonmenu-event)) (or n (setq n 1)) @@ -1203,13 +1215,16 @@ (run-hooks 'cal-tex-hook))) ;;;###cal-autoload -(defun cal-tex-cursor-week-at-a-glance (&optional n event) - "One-week-at-a-glance full page calendar for week indicated by cursor. -Optional prefix argument N specifies number of weeks (default 1), -starting on Mondays. The calendar shows holiday and diary entries -if `cal-tex-holidays' and `cal-tex-diary', respectively, are non-nil. -It does not show hours of the day. Optional EVENT indicates a buffer -position to use instead of point." +(defun cal-tex-cursor-week2-summary (&optional n event) + "Make a two page LaTeX calendar for one week, with optional diary entries. +It does not show hours of the day. +It shows holidays if `cal-tex-holidays' is non-nil. +It shows diary entries if `cal-tex-diary' is non-nil. + +The optional prefix argument N specifies a number of weeks (default 1). + +By default, the calendar is for the week at point; the optional +argument EVENT specifies a different buffer position." (interactive (list (prefix-numeric-value current-prefix-arg) last-nonmenu-event)) (cal-tex-weekly-common n event)) === modified file 'lisp/calendar/calendar.el' --- lisp/calendar/calendar.el 2012-09-25 04:13:02 +0000 +++ lisp/calendar/calendar.el 2012-10-06 18:34:23 +0000 @@ -1683,8 +1683,9 @@ (define-key map "td" 'cal-tex-cursor-day) (define-key map "tw1" 'cal-tex-cursor-week) (define-key map "tw2" 'cal-tex-cursor-week2) - (define-key map "tw3" 'cal-tex-cursor-week-iso) - (define-key map "tw4" 'cal-tex-cursor-week-monday) + (define-key map "tw3" 'cal-tex-cursor-week-iso) ; FIXME twi ? + (define-key map "tw4" 'cal-tex-cursor-week-monday) ; twm ? + (define-key map "twW" 'cal-tex-cursor-week2-summary) (define-key map "tfd" 'cal-tex-cursor-filofax-daily) (define-key map "tfw" 'cal-tex-cursor-filofax-2week) (define-key map "tfW" 'cal-tex-cursor-filofax-week) ------------------------------------------------------------ revno: 110389 committer: Stefan Monnier branch nick: trunk timestamp: Sat 2012-10-06 13:34:57 -0400 message: * lisp/emacs-lisp/cl-macs.el (cl-defstruct): Improve docstring. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 17:29:15 +0000 +++ lisp/ChangeLog 2012-10-06 17:34:57 +0000 @@ -1,5 +1,7 @@ 2012-10-06 Stefan Monnier + * emacs-lisp/cl-macs.el (cl-defstruct): Improve docstring. + * subr.el (read-passwd-map): New var. (read-passwd): Use `read-string' again. * minibuffer.el (delete-minibuffer-contents): Make it interactive. === modified file 'lisp/emacs-lisp/cl-loaddefs.el' --- lisp/emacs-lisp/cl-loaddefs.el 2012-09-29 02:02:34 +0000 +++ lisp/emacs-lisp/cl-loaddefs.el 2012-10-06 17:34:57 +0000 @@ -260,7 +260,7 @@ ;;;;;; cl-typecase cl-ecase cl-case cl-load-time-value cl-eval-when ;;;;;; cl-destructuring-bind cl-function cl-defmacro cl-defun cl-gentemp ;;;;;; cl-gensym cl--compiler-macro-cXXr cl--compiler-macro-list*) -;;;;;; "cl-macs" "cl-macs.el" "da92f58f688ff6fb4d0098eb0f3acf0b") +;;;;;; "cl-macs" "cl-macs.el" "6951d080daefb5194b1d21fe9b2deae4") ;;; Generated autoloads from cl-macs.el (autoload 'cl--compiler-macro-list* "cl-macs" "\ @@ -657,8 +657,9 @@ You can use the accessors to set the corresponding slots, via `setf'. NAME may instead take the form (NAME OPTIONS...), where each -OPTION is either a single keyword or (KEYWORD VALUE). -See Info node `(cl)Structures' for a list of valid keywords. +OPTION is either a single keyword or (KEYWORD VALUE) where +KEYWORD can be one of :conc-name, :constructor, :copier, :predicate, +:type, :named, :initial-offset, :print-function, or :include. Each SLOT may instead take the form (SLOT SLOT-OPTS...), where SLOT-OPTS are keyword-value pairs for that slot. Currently, only === modified file 'lisp/emacs-lisp/cl-macs.el' --- lisp/emacs-lisp/cl-macs.el 2012-09-28 23:30:52 +0000 +++ lisp/emacs-lisp/cl-macs.el 2012-10-06 17:34:57 +0000 @@ -2154,8 +2154,9 @@ You can use the accessors to set the corresponding slots, via `setf'. NAME may instead take the form (NAME OPTIONS...), where each -OPTION is either a single keyword or (KEYWORD VALUE). -See Info node `(cl)Structures' for a list of valid keywords. +OPTION is either a single keyword or (KEYWORD VALUE) where +KEYWORD can be one of :conc-name, :constructor, :copier, :predicate, +:type, :named, :initial-offset, :print-function, or :include. Each SLOT may instead take the form (SLOT SLOT-OPTS...), where SLOT-OPTS are keyword-value pairs for that slot. Currently, only ------------------------------------------------------------ revno: 110388 committer: Jan D. branch nick: trunk timestamp: Sat 2012-10-06 19:31:11 +0200 message: Handle fullscreen parameter in initial/defult-frame-alist for NS. * nsfns.m (Fx_create_frame): Call x_default_parameter with fullscreen/Fullscreen. * nsterm.h (EmacsView): Rename tbar_height to tibar_height. tobar_height is new. * nsterm.m (x_make_frame_visible): Check for fullscreen. (ns_fullscreen_hook): Activate old style fullscreen with a timer. (ns_term_init): Set activateIgnoringOtherApps if old style fullscreen. (windowDidResize:): Check for correct window if old style fullscreen. Capitalize word in comment. Remove incorrect comment. (initFrameFromEmacs:): tbar_height renamed tibar_height. (windowDidEnterFullScreen:): Toggle toolbar for fullscreen to fix error in drawing background. (toggleFullScreen:): Remove comment. Rearrange calls. Set toolbar values to zero, save old height in tobar_height. Restore tool bar height when leaving fullscreen. (canBecomeMainWindow): New function. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-10-06 12:55:09 +0000 +++ src/ChangeLog 2012-10-06 17:31:11 +0000 @@ -1,3 +1,24 @@ +2012-10-06 Jan Djärv + + * nsfns.m (Fx_create_frame): Call x_default_parameter with + fullscreen/Fullscreen. + + * nsterm.h (EmacsView): Rename tbar_height to tibar_height. + tobar_height is new. + + * nsterm.m (x_make_frame_visible): Check for fullscreen. + (ns_fullscreen_hook): Activate old style fullscreen with a timer. + (ns_term_init): Set activateIgnoringOtherApps if old style fullscreen. + (windowDidResize:): Check for correct window if old style fullscreen. + Capitalize word in comment. Remove incorrect comment. + (initFrameFromEmacs:): tbar_height renamed tibar_height. + (windowDidEnterFullScreen:): Toggle toolbar for fullscreen to fix + error in drawing background. + (toggleFullScreen:): Remove comment. Rearrange calls. + Set toolbar values to zero, save old height in tobar_height. + Restore tool bar height when leaving fullscreen. + (canBecomeMainWindow): New function. + 2012-10-06 Paul Eggert * keyboard.c (read_char): Remove unnecessary 'volatile's and label. === modified file 'src/nsfns.m' --- src/nsfns.m 2012-09-30 13:43:47 +0000 +++ src/nsfns.m 2012-10-06 17:31:11 +0000 @@ -1346,6 +1346,8 @@ RES_TYPE_NUMBER); x_default_parameter (f, parms, Qalpha, Qnil, "alpha", "Alpha", RES_TYPE_NUMBER); + x_default_parameter (f, parms, Qfullscreen, Qnil, + "fullscreen", "Fullscreen", RES_TYPE_SYMBOL); width = FRAME_COLS (f); height = FRAME_LINES (f); === modified file 'src/nsterm.h' --- src/nsterm.h 2012-09-30 12:50:09 +0000 +++ src/nsterm.h 2012-10-06 17:31:11 +0000 @@ -86,7 +86,8 @@ BOOL windowClosing; NSString *workingText; BOOL processingCompose; - int fs_state, fs_before_fs, next_maximized, tbar_height, bwidth; + int fs_state, fs_before_fs, next_maximized; + int tibar_height, tobar_height, bwidth; int maximized_width, maximized_height; NSWindow *nonfs_window; @public === modified file 'src/nsterm.m' --- src/nsterm.m 2012-10-02 18:51:51 +0000 +++ src/nsterm.m 2012-10-06 17:31:11 +0000 @@ -1068,8 +1068,23 @@ if this ends up the case again, comment this out again. */ if (!FRAME_VISIBLE_P (f)) { + EmacsView *view = (EmacsView *)FRAME_NS_VIEW (f); f->async_visible = 1; ns_raise_frame (f); + +#ifdef NEW_STYLE_FS + /* Making a new frame from a fullscreen frame will make the new frame + fullscreen also. So skip handleFS as this will print an error. */ + if (f->want_fullscreen == FULLSCREEN_BOTH + && ([[view window] styleMask] & NSFullScreenWindowMask) != 0) + return; +#endif + if (f->want_fullscreen != FULLSCREEN_NONE) + { + block_input (); + [view handleFS]; + unblock_input (); + } } } @@ -1317,6 +1332,18 @@ EmacsView *view = (EmacsView *)FRAME_NS_VIEW (f); if (! f->async_visible) return; +#ifndef NEW_STYLE_FS + if (f->want_fullscreen == FULLSCREEN_BOTH) + { + /* Old style fs don't initiate correctly if created from + init/default-frame alist, so use a timer (not nice...). + */ + [NSTimer scheduledTimerWithTimeInterval: 0.5 target: view + selector: @selector (handleFS) + userInfo: nil repeats: NO]; + return; + } +#endif block_input (); [view handleFS]; @@ -4210,6 +4237,11 @@ NSColorPboardType, NSFontPboardType, nil] retain]; +#ifndef NEW_STYLE_FS + /* If fullscreen is in init/default-frame-alist, focus isn't set + right for fullscreen windows, so set this. */ + [NSApp activateIgnoringOtherApps:YES]; +#endif [NSApp run]; ns_do_open_file = YES; @@ -5505,10 +5537,17 @@ - (void)windowDidResize: (NSNotification *)notification { + +#if !defined (NEW_STYLE_FS) && ! defined (NS_IMPL_GNUSTEP) + NSWindow *theWindow = [notification object]; + /* We can get notification on the non-FS window when in fullscreen mode. */ + if ([self window] != theWindow) return; +#endif + #ifdef NS_IMPL_GNUSTEP NSWindow *theWindow = [notification object]; - /* in GNUstep, at least currently, it's possible to get a didResize + /* In GNUstep, at least currently, it's possible to get a didResize without getting a willResize.. therefore we need to act as if we got the willResize now */ NSSize sz = [theWindow frame].size; @@ -5526,10 +5565,6 @@ } #endif /* NS_IMPL_COCOA */ - /* Avoid loop under GNUstep due to call at beginning of this function. - (x_set_window_size causes a resize which causes - a "windowDidResize" which calls x_set_window_size). */ -#ifndef NS_IMPL_GNUSTEP if (cols > 0 && rows > 0) { if (ns_in_resize) @@ -5539,7 +5574,6 @@ [self updateFrameSize: YES]; } } -#endif ns_send_appdefined (-1); } @@ -5661,7 +5695,7 @@ wr = [win frame]; bwidth = f->border_width = wr.size.width - r.size.width; - tbar_height = FRAME_NS_TITLEBAR_HEIGHT (f) = wr.size.height - r.size.height; + tibar_height = FRAME_NS_TITLEBAR_HEIGHT (f) = wr.size.height - r.size.height; [win setAcceptsMouseMovedEvents: YES]; [win setDelegate: self]; @@ -5870,8 +5904,16 @@ - (void)windowDidEnterFullScreen:(NSNotification *)notification { [self setFSValue: FULLSCREEN_BOTH]; -#ifndef NEW_STYLE_FS +#ifdef NEW_STYLE_FS + // Fix bad background. + if ([toolbar isVisible]) + { + [toolbar setVisible:NO]; + [toolbar setVisible:YES]; + } +#else [self windowDidBecomeKey:notification]; + [nonfs_window orderOut:self]; #endif } @@ -5891,11 +5933,6 @@ - (void)toggleFullScreen: (id)sender { - /* Bugs remain: - 1) Having fullscreen in initial/default frame alist. - 2) Fullscreen in default frame alist only applied to first frame. - */ - #ifdef NEW_STYLE_FS [[self window] toggleFullScreen:sender]; #else @@ -5904,7 +5941,7 @@ isEqual:[[NSScreen screens] objectAtIndex:0]]; struct frame *f = emacsframe; NSSize sz; - NSRect r; + NSRect r, wr = [w frame]; NSColor *col = ns_lookup_indexed_color (NS_FACE_BACKGROUND (FRAME_DEFAULT_FACE (f)), f); @@ -5930,7 +5967,7 @@ } fw = [[EmacsFSWindow alloc] - initWithContentRect:[w contentRectForFrameRect:[w frame]] + initWithContentRect:[w contentRectForFrameRect:wr] styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES @@ -5938,9 +5975,7 @@ [fw setContentView:[w contentView]]; [fw setTitle:[w title]]; - [fw makeKeyAndOrderFront:NSApp]; [fw setDelegate:self]; - [fw makeFirstResponder:self]; [fw setAcceptsMouseMovedEvents: YES]; [fw useOptimizedDrawing: YES]; [fw setResizeIncrements: sz]; @@ -5950,18 +5985,26 @@ f->border_width = 0; FRAME_NS_TITLEBAR_HEIGHT (f) = 0; + tobar_height = FRAME_TOOLBAR_HEIGHT (f); + FRAME_TOOLBAR_HEIGHT (f) = 0; + FRAME_EXTERNAL_TOOL_BAR (f) = 0; nonfs_window = w; + [self windowWillEnterFullScreen:nil]; + [fw makeKeyAndOrderFront:NSApp]; + [fw makeFirstResponder:self]; [w orderOut:self]; r = [fw frameRectForContentRect:[[fw screen] frame]]; [fw setFrame: r display:YES animate:YES]; [self windowDidEnterFullScreen:nil]; + [fw display]; } else { fw = w; w = nonfs_window; + nonfs_window = nil; if (onFirstScreen) { @@ -5980,7 +6023,10 @@ [w setOpaque: NO]; f->border_width = bwidth; - FRAME_NS_TITLEBAR_HEIGHT (f) = tbar_height; + FRAME_NS_TITLEBAR_HEIGHT (f) = tibar_height; + FRAME_TOOLBAR_HEIGHT (f) = tobar_height; + if (tobar_height) + FRAME_EXTERNAL_TOOL_BAR (f) = 1; [self windowWillExitFullScreen:nil]; [fw setFrame: [w frame] display:YES animate:YES]; @@ -6553,6 +6599,11 @@ return YES; } +- (BOOL)canBecomeMainWindow +{ + return YES; +} + @end /* ========================================================================== ------------------------------------------------------------ revno: 110387 committer: Stefan Monnier branch nick: trunk timestamp: Sat 2012-10-06 13:29:15 -0400 message: * lisp/subr.el (read-passwd-map): New var. (read-passwd): Use `read-string' again. * lisp/minibuffer.el (delete-minibuffer-contents): Make it interactive. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 17:16:26 +0000 +++ lisp/ChangeLog 2012-10-06 17:29:15 +0000 @@ -1,3 +1,9 @@ +2012-10-06 Stefan Monnier + + * subr.el (read-passwd-map): New var. + (read-passwd): Use `read-string' again. + * minibuffer.el (delete-minibuffer-contents): Make it interactive. + 2012-10-06 Jambunathan K * register.el (append-to-register, prepend-to-register): === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2012-09-30 09:18:38 +0000 +++ lisp/minibuffer.el 2012-10-06 17:29:15 +0000 @@ -632,6 +632,7 @@ (defun delete-minibuffer-contents () "Delete all user input in a minibuffer. If the current buffer is not a minibuffer, erase its entire contents." + (interactive) ;; We used to do `delete-field' here, but when file name shadowing ;; is on, the field doesn't cover the entire minibuffer contents. (delete-region (minibuffer-prompt-end) (point-max))) === modified file 'lisp/subr.el' --- lisp/subr.el 2012-10-06 16:59:01 +0000 +++ lisp/subr.el 2012-10-06 17:29:15 +0000 @@ -2143,6 +2143,13 @@ (setq first nil)) code)) +(defconst read-passwd-map + (let ((map (make-sparse-keymap))) + (set-keymap-parent map minibuffer-local-map) + (define-key map "\C-u" #'delete-minibuffer-contents) ;bug#12570 + map) + "Keymap used while reading passwords.") + (defun read-passwd (prompt &optional confirm default) "Read a password, prompting with PROMPT, and return it. If optional CONFIRM is non-nil, read the password twice to make sure. @@ -2180,19 +2187,11 @@ (setq minibuf (current-buffer)) ;; Turn off electricity. (set (make-local-variable 'post-self-insert-hook) nil) + (use-local-map read-passwd-map) (add-hook 'after-change-functions hide-chars-fun nil 'local)) (unwind-protect - (let ((enable-recursive-minibuffers t) - (map (make-sparse-keymap)) - result) - (set-keymap-parent map minibuffer-local-map) - (define-key map "\C-u" ; bug#12570 - (lambda () (interactive) (delete-minibuffer-contents))) - (setq result - ;; t = no history. - (read-from-minibuffer prompt nil map nil t default)) - (if (and (equal "" result) default) default - result)) + (let ((enable-recursive-minibuffers t)) + (read-string prompt nil t default)) ; t = "no history" (when (buffer-live-p minibuf) (with-current-buffer minibuf ;; Not sure why but it seems that there might be cases where the ------------------------------------------------------------ revno: 110386 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=12389 author: Jambunathan K committer: Stefan Monnier branch nick: trunk timestamp: Sat 2012-10-06 13:16:26 -0400 message: * lisp/register.el (append-to-register, prepend-to-register): Deactivate mark, as does `copy-to-register'. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 14:18:35 +0000 +++ lisp/ChangeLog 2012-10-06 17:16:26 +0000 @@ -1,3 +1,8 @@ +2012-10-06 Jambunathan K + + * register.el (append-to-register, prepend-to-register): + Deactivate mark, as does `copy-to-register' (bug#12389). + 2012-10-06 Chong Yidong * files.el (auto-mode-alist): Add .by and .wy (Semantic grammars). @@ -68,7 +73,7 @@ (python-fill-decorator-function, python-fill-paren-function): Remove :safe for defcustoms. (python-fill-string-style): New defcustom - (python-fill-paragraph-function): Enhanced context detection. + (python-fill-paragraph-function): Enhance context detection. (python-fill-string): Honor python-fill-string-style settings. 2012-10-04 Martin Rudalics @@ -100,8 +105,8 @@ 2012-10-02 Chong Yidong - * progmodes/hideif.el (hif-lookup, hif-defined): Handle - semantic-c-takeover-hideif. + * progmodes/hideif.el (hif-lookup, hif-defined): + Handle semantic-c-takeover-hideif. 2012-10-02 Paul Eggert @@ -117,8 +122,8 @@ 2012-10-02 Sergio Durigan Junior (tiny change) - * net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result): Fix - querying BBDB for entries without a last name (Bug#11580). + * net/eudcb-bbdb.el (eudc-bbdb-format-record-as-result): + Fix querying BBDB for entries without a last name (Bug#11580). 2012-10-02 Chong Yidong === modified file 'lisp/register.el' --- lisp/register.el 2012-09-09 08:10:56 +0000 +++ lisp/register.el 2012-10-06 17:16:26 +0000 @@ -382,6 +382,7 @@ register (cond ((not reg) text) ((stringp reg) (concat reg separator text)) (t (error "Register does not contain text"))))) + (setq deactivate-mark t) (cond (delete-flag (delete-region start end)) ((called-interactively-p 'interactive) @@ -400,6 +401,7 @@ register (cond ((not reg) text) ((stringp reg) (concat text separator reg)) (t (error "Register does not contain text"))))) + (setq deactivate-mark t) (cond (delete-flag (delete-region start end)) ((called-interactively-p 'interactive) ------------------------------------------------------------ revno: 110385 committer: Glenn Morris branch nick: trunk timestamp: Sat 2012-10-06 09:59:01 -0700 message: Fix previous read-passwd change diff: === modified file 'lisp/subr.el' --- lisp/subr.el 2012-10-06 02:47:26 +0000 +++ lisp/subr.el 2012-10-06 16:59:01 +0000 @@ -2183,8 +2183,9 @@ (add-hook 'after-change-functions hide-chars-fun nil 'local)) (unwind-protect (let ((enable-recursive-minibuffers t) - (map minibuffer-local-map) + (map (make-sparse-keymap)) result) + (set-keymap-parent map minibuffer-local-map) (define-key map "\C-u" ; bug#12570 (lambda () (interactive) (delete-minibuffer-contents))) (setq result ------------------------------------------------------------ revno: 110384 committer: Chong Yidong branch nick: trunk timestamp: Sat 2012-10-06 22:22:31 +0800 message: Update for admin/grammars/README. diff: === modified file 'admin/grammars/README' --- admin/grammars/README 2011-11-26 06:28:10 +0000 +++ admin/grammars/README 2012-10-06 14:22:31 +0000 @@ -3,8 +3,8 @@ lisp/semantic/wisent/ directories. You can run the parser generators with -emacs -batch -Q -l bovine-grammar.el -f bovine-make-parsers -emacs -batch -Q -l wisent-grammar.el -f wisent-make-parsers +emacs -batch -Q -l semantic/bovine/grammar -f bovine-make-parsers +emacs -batch -Q -l semantic/wisent/grammar -f wisent-make-parsers Currently, the parser files in lisp/ are not generated directly from these grammar files when making Emacs. This state of affairs, and the ------------------------------------------------------------ revno: 110383 committer: Chong Yidong branch nick: trunk timestamp: Sat 2012-10-06 22:18:35 +0800 message: Move bovine-grammar and wisent-grammar into lisp/ directory. * lisp/files.el (auto-mode-alist): Add .by and .wy (Semantic grammars). * cedet/semantic/bovine/grammar.el: * cedet/semantic/wisent/grammar.el: Move from admin/grammars. Add autoloads for bovine-grammar-mode and wisent-grammar-mode. diff: === modified file 'admin/ChangeLog' --- admin/ChangeLog 2012-10-01 18:10:29 +0000 +++ admin/ChangeLog 2012-10-06 14:18:35 +0000 @@ -1,5 +1,10 @@ 2012-10-01 David Engster + * grammars/bovine-grammar.el: + * grammars/wisent-grammar.el: Move to lisp directory. + +2012-10-01 David Engster + * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote): Remove. (bovine-grammar-expand-form): Test for emacs-major-version. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 12:55:09 +0000 +++ lisp/ChangeLog 2012-10-06 14:18:35 +0000 @@ -1,3 +1,7 @@ +2012-10-06 Chong Yidong + + * files.el (auto-mode-alist): Add .by and .wy (Semantic grammars). + 2012-10-06 Ikumi Keita (tiny change) * international/characters.el: Fix simple mistake ((car chars) -> === modified file 'lisp/cedet/ChangeLog' --- lisp/cedet/ChangeLog 2012-10-02 05:02:52 +0000 +++ lisp/cedet/ChangeLog 2012-10-06 14:18:35 +0000 @@ -1,3 +1,9 @@ +2012-10-06 Chong Yidong + + * semantic/bovine/grammar.el: + * semantic/wisent/grammar.el: Move from admin/grammars. Add + autoloads for bovine-grammar-mode and wisent-grammar-mode. + 2012-10-02 Chong Yidong * srecode.el, ede.el: Restore Version header. === renamed file 'admin/grammars/bovine-grammar.el' => 'lisp/cedet/semantic/bovine/grammar.el' --- admin/grammars/bovine-grammar.el 2012-10-01 18:10:29 +0000 +++ lisp/cedet/semantic/bovine/grammar.el 2012-10-06 14:18:35 +0000 @@ -1,4 +1,4 @@ -;;; bovine-grammar.el --- Bovine's input grammar mode +;;; semantic/bovine/grammar.el --- Bovine's input grammar mode ;; ;; Copyright (C) 2002-2012 Free Software Foundation, Inc. ;; @@ -413,18 +413,17 @@ "")))) (defvar bovine-grammar-menu - '("BY Grammar" - ) + '("BY Grammar") "BY mode specific grammar menu. Menu items are appended to the common grammar menu.") +;;;###autoload (define-derived-mode bovine-grammar-mode semantic-grammar-mode "BY" "Major mode for editing Bovine grammars." (semantic-grammar-setup-menu bovine-grammar-menu) (semantic-install-function-overrides '((grammar-parsetable-builder . bovine-grammar-parsetable-builder) - (grammar-setupcode-builder . bovine-grammar-setupcode-builder) - ))) + (grammar-setupcode-builder . bovine-grammar-setupcode-builder)))) (add-to-list 'auto-mode-alist '("\\.by\\'" . bovine-grammar-mode)) @@ -444,8 +443,6 @@ ) "Semantic grammar macros used in bovine grammars.") -(provide 'semantic/bovine/grammar) - (defun bovine-make-parsers () "Generate Emacs' built-in Bovine-based parser files." (interactive) @@ -504,4 +501,6 @@ (replace-match packagename nil nil nil 1) (save-buffer)))))) -;;; bovine-grammar.el ends here +(provide 'semantic/bovine/grammar) + +;;; semantic/bovine/grammar.el ends here === renamed file 'admin/grammars/wisent-grammar.el' => 'lisp/cedet/semantic/wisent/grammar.el' --- admin/grammars/wisent-grammar.el 2012-10-01 18:10:29 +0000 +++ lisp/cedet/semantic/wisent/grammar.el 2012-10-06 14:18:35 +0000 @@ -1,4 +1,4 @@ -;;; wisent-grammar.el --- Wisent's input grammar mode +;;; semantic/wisent/grammar.el --- Wisent's input grammar mode ;; Copyright (C) 2002-2012 Free Software Foundation, Inc. ;; @@ -323,15 +323,13 @@ "WY mode specific grammar menu. Menu items are appended to the common grammar menu.") +;;;###autoload (define-derived-mode wisent-grammar-mode semantic-grammar-mode "WY" "Major mode for editing Wisent grammars." (semantic-grammar-setup-menu wisent-grammar-menu) (semantic-install-function-overrides '((grammar-parsetable-builder . wisent-grammar-parsetable-builder) - (grammar-setupcode-builder . wisent-grammar-setupcode-builder) - ))) - -(add-to-list 'auto-mode-alist '("\\.wy\\'" . wisent-grammar-mode)) + (grammar-setupcode-builder . wisent-grammar-setupcode-builder)))) (defvar-mode-local wisent-grammar-mode semantic-grammar-macros '( @@ -498,7 +496,7 @@ (insert-file-contents filename) ;; Fix copyright header: (goto-char (point-min)) - (when additional-copyright + (when additional-copyright (re-search-forward "Copyright (C).*$") (insert "\n;; " additional-copyright)) (re-search-forward "^;; Author:") @@ -523,4 +521,6 @@ (delete-trailing-whitespace) (write-region nil nil (expand-file-name filename)))))))) -;;; wisent-grammar.el ends here +(provide 'semantic/wisent/grammar) + +;;; semantic/wisent/grammar.el ends here === modified file 'lisp/files.el' --- lisp/files.el 2012-10-05 07:38:05 +0000 +++ lisp/files.el 2012-10-06 14:18:35 +0000 @@ -2326,6 +2326,8 @@ ("\\.js\\'" . javascript-mode) ("\\.json\\'" . javascript-mode) ("\\.[ds]?vh?\\'" . verilog-mode) + ("\\.by\\'" . bovine-grammar-mode) + ("\\.wy\\'" . wisent-grammar-mode) ;; .emacs or .gnus or .viper following a directory delimiter in ;; Unix, MSDOG or VMS syntax. ("[]>:/\\]\\..*\\(emacs\\|gnus\\|viper\\)\\'" . emacs-lisp-mode) ------------------------------------------------------------ revno: 110382 committer: Chong Yidong branch nick: trunk timestamp: Sat 2012-10-06 22:18:03 +0800 message: * doc/emacs/mini.texi (Passwords): Fix typo. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2012-10-02 06:44:30 +0000 +++ doc/emacs/ChangeLog 2012-10-06 14:18:03 +0000 @@ -1,3 +1,7 @@ +2012-10-06 Chong Yidong + + * mini.texi (Passwords): Fix typo. + 2012-10-02 Glenn Morris * maintaining.texi (VC Directory Commands): === modified file 'doc/emacs/mini.texi' --- doc/emacs/mini.texi 2012-09-30 09:18:38 +0000 +++ doc/emacs/mini.texi 2012-10-06 14:18:03 +0000 @@ -727,7 +727,7 @@ with Emacs until you have submitted the password. While you are typing the password, you may press @key{DEL} to delete -backwards, removing the last character entered. @key{C-u} deletes +backwards, removing the last character entered. @kbd{C-u} deletes everything you have typed so far. @kbd{C-g} quits the password prompt (@pxref{Quitting}). @kbd{C-y} inserts the current kill into the password (@pxref{Killing}). You may type either @key{RET} or ------------------------------------------------------------ revno: 110381 [merge] committer: Kenichi Handa branch nick: trunk timestamp: Sat 2012-10-06 21:56:11 +0900 message: international/characters.el: Fix simple mistake ((car chars) -> elt), delete duplicated code. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 02:47:26 +0000 +++ lisp/ChangeLog 2012-10-06 12:55:09 +0000 @@ -1,3 +1,8 @@ +2012-10-06 Ikumi Keita (tiny change) + + * international/characters.el: Fix simple mistake ((car chars) -> + elt), delete duplicated code. + 2012-10-06 Glenn Morris * subr.el (read-passwd): Allow C-u to erase entry. (Bug#12570) === modified file 'lisp/international/characters.el' --- lisp/international/characters.el 2012-04-14 01:46:06 +0000 +++ lisp/international/characters.el 2012-10-06 12:34:03 +0000 @@ -226,7 +226,7 @@ (map-charset-chars #'modify-syntax-entry 'japanese-jisx0208 "_" #x2821 #x287E) (let ((chars '(?ー ?゛ ?゜ ?ヽ ?ヾ ?ゝ ?ゞ ?〃 ?仝 ?々 ?〆 ?〇))) (dolist (elt chars) - (modify-syntax-entry (car chars) "w"))) + (modify-syntax-entry elt "w"))) (map-charset-chars #'modify-category-entry 'japanese-jisx0208 ?A #x2321 #x237E) (map-charset-chars #'modify-category-entry 'japanese-jisx0208 ?H #x2421 #x247E) @@ -234,12 +234,6 @@ (map-charset-chars #'modify-category-entry 'japanese-jisx0208 ?G #x2621 #x267E) (map-charset-chars #'modify-category-entry 'japanese-jisx0208 ?Y #x2721 #x277E) (map-charset-chars #'modify-category-entry 'japanese-jisx0208 ?C #x3021 #x7E7E) -(modify-category-entry ?ー ?K) -(let ((chars '(?゛ ?゜))) - (while chars - (modify-category-entry (car chars) ?K) - (modify-category-entry (car chars) ?H) - (setq chars (cdr chars)))) (let ((chars '(?仝 ?々 ?〆 ?〇))) (while chars (modify-category-entry (car chars) ?C) ------------------------------------------------------------ revno: 110380 fixes bug: http://debbugs.gnu.org/12570 committer: Glenn Morris branch nick: trunk timestamp: Fri 2012-10-05 19:47:26 -0700 message: * subr.el (read-passwd): Allow C-u to erase entry. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-10-06 02:20:36 +0000 +++ lisp/ChangeLog 2012-10-06 02:47:26 +0000 @@ -1,3 +1,7 @@ +2012-10-06 Glenn Morris + + * subr.el (read-passwd): Allow C-u to erase entry. (Bug#12570) + 2012-10-06 Julian Scheid (tiny change) * color.el (color-hsl-to-rgb): Fix incorrect results for === modified file 'lisp/subr.el' --- lisp/subr.el 2012-10-05 05:57:24 +0000 +++ lisp/subr.el 2012-10-06 02:47:26 +0000 @@ -2182,8 +2182,16 @@ (set (make-local-variable 'post-self-insert-hook) nil) (add-hook 'after-change-functions hide-chars-fun nil 'local)) (unwind-protect - (let ((enable-recursive-minibuffers t)) - (read-string prompt nil t default)) ; t = "no history" + (let ((enable-recursive-minibuffers t) + (map minibuffer-local-map) + result) + (define-key map "\C-u" ; bug#12570 + (lambda () (interactive) (delete-minibuffer-contents))) + (setq result + ;; t = no history. + (read-from-minibuffer prompt nil map nil t default)) + (if (and (equal "" result) default) default + result)) (when (buffer-live-p minibuf) (with-current-buffer minibuf ;; Not sure why but it seems that there might be cases where the ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.