Now on revision 106565. ------------------------------------------------------------ revno: 106565 committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2011-12-01 04:55:39 +0000 message: Gnus: Share the value of the buffer-local `message-options' variable between a draft buffer and temprary working buffers. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-30 14:52:08 +0000 +++ lisp/gnus/ChangeLog 2011-12-01 04:55:39 +0000 @@ -1,3 +1,11 @@ +2011-12-01 Katsumi Yamaoka + + * gnus-msg.el (gnus-inews-do-gcc): + * message.el (message-send-mail): + * mml.el (mml-generate-mime): Share the value of the buffer-local + `message-options' variable between a draft buffer and temprary working + buffers. + 2011-11-30 Stefan Monnier * message.el (message-pop-to-buffer): Revert 2011-09-11 change. === modified file 'lisp/gnus/gnus-msg.el' --- lisp/gnus/gnus-msg.el 2011-09-11 22:50:22 +0000 +++ lisp/gnus/gnus-msg.el 2011-12-01 04:55:39 +0000 @@ -1549,7 +1549,7 @@ (message-narrow-to-headers) (let ((gcc (or gcc (mail-fetch-field "gcc" nil t))) (cur (current-buffer)) - groups group method group-art + groups group method group-art options mml-externalize-attachments) (when gcc (message-remove-header "gcc") @@ -1573,6 +1573,7 @@ gnus-gcc-externalize-attachments)) (save-excursion (nnheader-set-temp-buffer " *acc*") + (setq message-options (with-current-buffer cur message-options)) (insert-buffer-substring cur) (message-encode-message-body) (save-restriction @@ -1629,6 +1630,8 @@ (boundp 'gnus-inews-mark-gcc-as-read) (symbol-value 'gnus-inews-mark-gcc-as-read)))) (gnus-group-mark-article-read group (cdr group-art))) + (setq options message-options) + (with-current-buffer cur (setq message-options options)) (kill-buffer (current-buffer))))))))) (defun gnus-inews-insert-gcc (&optional group) === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2011-11-30 14:52:08 +0000 +++ lisp/gnus/message.el 2011-12-01 04:55:39 +0000 @@ -4507,7 +4507,8 @@ (boundp 'gnus-group-posting-charset-alist)) (gnus-setup-posting-charset nil) message-posting-charset)) - (headers message-required-mail-headers)) + (headers message-required-mail-headers) + options) (when (and message-generate-hashcash (not (eq message-generate-hashcash 'opportunistic))) (message "Generating hashcash...") @@ -4546,9 +4547,11 @@ (error "Failed to send the message"))))) ;; Let the user do all of the above. (run-hooks 'message-header-hook)) + (setq options message-options) (unwind-protect (with-current-buffer tembuf (erase-buffer) + (setq message-options options) ;; Avoid copying text props (except hard newlines). (insert (with-current-buffer mailbuf (mml-buffer-substring-no-properties-except-hard-newlines @@ -4630,9 +4633,11 @@ (message "Sending via mail...") (funcall (or message-send-mail-real-function message-send-mail-function))) - (message-send-mail-partially))) + (message-send-mail-partially)) + (setq options message-options)) (kill-buffer tembuf)) (set-buffer mailbuf) + (setq message-options options) (push 'mail message-sent-message-via))) (defvar sendmail-program) === modified file 'lisp/gnus/mml.el' --- lisp/gnus/mml.el 2011-11-27 04:43:11 +0000 +++ lisp/gnus/mml.el 2011-12-01 04:55:39 +0000 @@ -466,16 +466,21 @@ (defun mml-generate-mime () "Generate a MIME message based on the current MML document." (let ((cont (mml-parse)) - (mml-multipart-number mml-multipart-number)) + (mml-multipart-number mml-multipart-number) + (options message-options)) (if (not cont) nil - (mm-with-multibyte-buffer - (if (and (consp (car cont)) - (= (length cont) 1)) - (mml-generate-mime-1 (car cont)) - (mml-generate-mime-1 (nconc (list 'multipart '(type . "mixed")) - cont))) - (buffer-string))))) + (prog1 + (mm-with-multibyte-buffer + (setq message-options options) + (if (and (consp (car cont)) + (= (length cont) 1)) + (mml-generate-mime-1 (car cont)) + (mml-generate-mime-1 (nconc (list 'multipart '(type . "mixed")) + cont))) + (setq options message-options) + (buffer-string)) + (setq message-options options))))) (defun mml-generate-mime-1 (cont) (let ((mm-use-ultra-safe-encoding ------------------------------------------------------------ revno: 106564 committer: Glenn Morris branch nick: trunk timestamp: Wed 2011-11-30 20:37:04 -0800 message: Relocate ChangeLog entries to correct date. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-30 16:33:05 +0000 +++ lisp/ChangeLog 2011-12-01 04:37:04 +0000 @@ -1,32 +1,4 @@ -2011-11-30 Juanma Barranquero - - * htmlfontify.el (hfy-page-header, hfy-post-html-hooks) - (hfy-shell-file-name, hfy-shell): - * international/fontset.el (x-decompose-font-name): Fix typos. - -2011-11-29 Ken Brown - - * progmodes/gdb-mi.el: Fix bug#9853, bug#9858, and bug#9878. - (gdb-version): Remove defvar. - (gdb-supports-non-stop): New defvar, replacing `gdb-version'. - (gdb-gud-context-command, gdb-non-stop-handler) - (gdb-current-context-command, gdb-stopped): Use it. - (gdb-init-1): Enable pretty printing here. - (gdb-non-stop-handler): Don't enable pretty-printing here. Check - to see if the target supports non-stop mode; if not, turn off - non-stop mode. Use the following. - (gdb-check-target-async): New defun. - (gud-watch, gdb-stopped): Fix whitespace. - (gdb-get-source-file): Don't try to display the source file if - `gdb-main-file' is nil. - -2011-11-29 Stefan Monnier - - * align.el: Try to generate fewer markers (bug#10047). - (align--set-marker): New macro. - (align-region): Use it. - -2011-11-29 Michael McNamara +2011-12-01 Michael McNamara * progmodes/verilog-mode.el (verilog-pretty-expr): Rework verilog-pretty-expr to handle new assignment operators in system @@ -56,7 +28,7 @@ (verilog-sk-ovm-class): Add skeleton for OVM classes (reported by Alain Mellan). -2011-11-29 Wilson Snyder +2011-12-01 Wilson Snyder * progmodes/verilog-mode.el (verilog-read-defines): Fix reading parameters with embedded comments. Reported by Ray Stevens. @@ -181,6 +153,34 @@ (verilog-read-decls): Fix parsing of unsigned data types, bug302. Reported by Jan Frode Lonnum. +2011-11-30 Juanma Barranquero + + * htmlfontify.el (hfy-page-header, hfy-post-html-hooks) + (hfy-shell-file-name, hfy-shell): + * international/fontset.el (x-decompose-font-name): Fix typos. + +2011-11-29 Ken Brown + + * progmodes/gdb-mi.el: Fix bug#9853, bug#9858, and bug#9878. + (gdb-version): Remove defvar. + (gdb-supports-non-stop): New defvar, replacing `gdb-version'. + (gdb-gud-context-command, gdb-non-stop-handler) + (gdb-current-context-command, gdb-stopped): Use it. + (gdb-init-1): Enable pretty printing here. + (gdb-non-stop-handler): Don't enable pretty-printing here. Check + to see if the target supports non-stop mode; if not, turn off + non-stop mode. Use the following. + (gdb-check-target-async): New defun. + (gud-watch, gdb-stopped): Fix whitespace. + (gdb-get-source-file): Don't try to display the source file if + `gdb-main-file' is nil. + +2011-11-29 Stefan Monnier + + * align.el: Try to generate fewer markers (bug#10047). + (align--set-marker): New macro. + (align-region): Use it. + 2011-11-29 Stefan Monnier * isearch.el (isearch-yank-x-selection): Deactivate mark (bug#10022). ------------------------------------------------------------ revno: 106563 author: Michael McNamara , Wilson Snyder committer: Dan Nicolaescu branch nick: trunk timestamp: Wed 2011-11-30 19:41:47 -0700 message: Update verilog-mode.el from master. * progmodes/verilog-mode.el (verilog-pretty-expr): Rework verilog-pretty-expr to handle new assignment operators in system verilog, such as += *= and the like. (verilog-assignment-operator-re): Regular expression to find the assigment operator in a verilog assignment. (verilog-assignment-operation-re): Regular expression to find an assignment statement for pretty-expr. (verilog-in-attribute-p): Query returns true if point is in an attribute context; used to skip these for expression line up from pretty-expr. (verilog-in-parameter-p): Query returns true if point is in an parameter definition context; used to skip these for expression line up from pretty-expr. (verilog-in-parenthesis-p): Query returns true if point is in a parenthetical expression, specifically ( ) but not [ ] or { }; used by pretty-expr. (verilog-just-one-space): If there is no space, don't add one. (verilog-get-lineup-indent-2): Specifically skip just attribute contexts for expression lineup, rather than skipping all parenthetical expressions. (verilog-calculate-indent): Fix comment, and fix indent. (verilog-do-indent): Indent declarations in lists (suggested by Joachim Lechner). (verilog-mode-abbrev-table): Populate abbrev mode with the various skeleton items. (verilog-sk-ovm-class): Add skeleton for OVM classes (reported by Alain Mellan). * verilog-mode.el (verilog-read-defines): Fix reading parameters with embedded comments. Reported by Ray Stevens. (verilog-calc-1, verilog-fork-wait-re) (verilog-forward-sexp, verilog-wait-fork-re): Fix indentation of "wait fork", bug407. Reported by Tim Holt. (verilog-auto): Fix AUTOing a upper module then AUTOing module instantiated by upper module causing wrong expansion until AUTOed a second time. Reported by K C Buckenmaier. (verilog-diff-auto): Fix showing .* as a difference when `verilog-auto-star-save' off. Reported by Dan Dever. (verilog-auto-reset, verilog-read-always-signals) (verilog-auto-reset-blocking-in-non): Fix AUTORESET including temporary signals in reset list if verilog-auto-reset-blocking-in-non is nil, and match assignment style to each signal's assignment type, bug381. Reported by Thomas Esposito. (verilog-sk-uvm-class, verilog-uvm-begin-re, verilog-uvm-end-re) (verilog-uvm-statement-re): Support UVM indentation and highlighting, with old OVM keywords only. (verilog-auto-tieoff, verilog-auto-tieoff-declaration): Support AUTOTIEOFF creating non-wire data types. Suggested by Jonathan Greenlaw. (verilog-auto-insert-lisp, verilog-delete-to-paren) (verilog-forward-sexp-cmt, verilog-forward-sexp-ign-cmt) (verilog-inject-sense, verilog-read-inst-pins) (verilog-read-sub-decls, verilog-read-sub-decls-line): Fix mismatching parenthesis inside commented out code when deleting AUTOINST, bug383. Reported by Jonathan Greenlaw. (verilog-auto-ascii-enum): Fix AUTOASCIIENUM one-hot with non-numeric vector width. Reported by Alex Reed. (verilog-auto-ascii-enum): Add "onehot" option to work around not detecting signals with parameter widths. Reported by Alex Reed. (verilog-auto-delete-trailing-whitespace): With `verilog-auto-delete-trailing-whitespace' remove trailing whitespace in auto expansion, bug371. Reported by Brad Dobbie. (verilog-run-hooks, verilog-scan-cache-flush, verilog-syntax-ppss): Fix verilog-scan-cache corruption when running user AUTO expansion hooks that call indentation routines. (verilog-simplify-range-expression): Fix typo ignoring lower case identifiers. (verilog-delete-auto): Fix delete-autos to also remove user created automatics, as long as they start with AUTO. (verilog-batch-diff-auto, verilog-diff-auto) (verilog-diff-function): Add `verilog-diff-auto' and bind to "C-c?" to report differences in AUTO expansion, ignoring spaces. (verilog-backward-syntactic-ws-quick, verilog-beg-of-defun-quick) (verilog-in-paren-quick, verilog-re-search-backward-quick) (verilog-re-search-forward-quick, verilog-syntax-ppss): Fix calling `syntax-ppss' when inside auto expansions as the ppss hook is disabled and its cache will get corrupt, causing AUTOS not to expand. Instead use only -quick functions. (verilog-scan-region): Fix scanning over escaped quotes. (verilog-inside-comment-or-string-p, verilog-inside-comment-p) (verilog-re-search-backward-quick) (verilog-re-search-forward-quick, verilog-scan): verilog-scan and related functions now ignore strings, to fix misparsing of strings with magic comments embedded in them. (verilog-read-auto-template): Fix 'verilog-auto-inst-template-numbers' with extra newline before (. Reported by Brad Dobbie. (verilog-read-auto-template): Fix 'verilog-auto-inst-template-numbers' with comments. Reported by Brad Dobbie. (verilog-auto-inst, verilog-auto-inst-param) (verilog-auto-inst-sort): Add 'verilog-auto-inst-sort' to reduce merge conflicts with AUTOINST, bug358. Reported by Brad Dobbie. (verilog-auto-inst-template-numbers): Add 'lhs' policy for debugging templates without merge conflicts, bug357. Reported by Brad Dobbie. (verilog-read-auto-template): Fix verilog-auto-inst-template-numbers with multiple templates. Reported by Brad Dobbie. (verilog-define-abbrev): Fix verilog-mode abbrevs to be system abbrevs so user won't be asked to save. (verilog-read-auto-lisp-present): Fix to start at beginning of buffer in case called outside of verilog-auto. (verilog-simplify-range-expression): Fix AUTOWIRE expanding "X-1+1" to "X-2". Reported by Matthew Myers. (verilog-auto, verilog-auto-inout-in): Add AUTOINOUTIN for creating all inputs from module templates. Reported by Leith Johnson. (verilog-module-inside-filename-p): Fix locating programs as with modules. (verilog-auto-inst-port): Fix vl-width expressions when using verilog-auto-inst-param-value, bug331. Reported by Julian Gorfajn. (verilog-decls-get-regs, verilog-decls-get-signals, verilog-decls-get-vars, verilog-decls-get-wires, verilog-decls-new, verilog-modi-cache-add-vars, verilog-modi-cache-add-wires, verilog-read-decls): Combine reg and wire structures into one var structure to represent SystemVerilog concepts. (verilog-auto-ascii-enum, verilog-auto-logic, verilog-auto-reg) (verilog-auto-reg-input, verilog-auto-tieoff, verilog-auto-wire) (verilog-auto-wire-type, verilog-insert-definition): Add verilog-auto-wire-type and AUTOLOGIC to support using SystemVerilog "logic" keyword instead of "wire"/"reg". (verilog-auto-reg-input, verilog-decls-get-signals): Fix AUTOWIRE to declares outputs that also have assignments (presumably in an ifdef or generate if so there's not a driver conflict). Reported by Matthew Myers. (verilog-auto-declare-nettype, verilog-insert-definition): Add verilog-auto-declare-nettype to fix declarations using `default_nettype none. Reported by Julian Gorfajn. (verilog-read-always-signals-recurse, verilog-read-decls) (verilog-read-sub-decls-gate): Fix infinite loop with (*) and malformed end statement, bug325. Reported by Joshua Wise and Andrew Drake. (verilog-auto-star-safe, verilog-delete-auto-star-implicit) (verilog-inst-comment-re): Fix not deleting Interfaced comment when expanding .* in interfaces, bug320. Reported by Pierre-David Pfister. (verilog-read-module-name): Fix import statements between module name and open parenthesis, bug317. Reported by Pierre-David Pfister. (verilog-simplify-range-expression): Fix simplification of multiplications inside AUTOWIRE connections, bug303. (verilog-auto-inst-port): Support parameter expansion in multidimensional arrays. (verilog-read-decls): Fix AUTOREG etc looking for "endproperty" after "assert property". Reported by Julian Gorfajn. (verilog-simplify-range-expression): Fix "couldn't merge" errors with multiplication, bug303. (verilog-read-decls): Fix parsing of unsigned data types, bug302. diff: === modified file 'lisp/progmodes/verilog-mode.el' --- lisp/progmodes/verilog-mode.el 2011-11-24 01:58:14 +0000 +++ lisp/progmodes/verilog-mode.el 2011-12-01 02:41:47 +0000 @@ -87,7 +87,7 @@ ;; you may add the below lines (the values of the variables presented ;; here are the defaults). Note also that if you use an Emacs that ;; supports custom, it's probably better to use the custom menu to -;; edit these. If working as a member of a large team these settings +;; edit these. If working as a member of a large team these settings ;; should be common across all users (in a site-start file), or set ;; in Local Variables in every file. Otherwise, different people's ;; AUTO expansion may result different whitespace changes. @@ -123,9 +123,9 @@ ;;; Code: ;; This variable will always hold the version number of the mode -(defconst verilog-mode-version "650" +(defconst verilog-mode-version "725" "Version of this Verilog mode.") -(defconst verilog-mode-release-date "2010-11-05-GNU" +(defconst verilog-mode-release-date "2011-11-27-GNU" "Release date of this Verilog mode.") (defconst verilog-mode-release-emacs t "If non-nil, this version of Verilog mode was released with Emacs itself.") @@ -174,6 +174,18 @@ (char-after (1- (point))))) (error nil)) (condition-case nil + (if (fboundp 'when) + nil ;; fab + (defsubst point-at-bol (&optional N) + (save-excursion (beginning-of-line N) (point)))) + (error nil)) + (condition-case nil + (if (fboundp 'when) + nil ;; fab + (defsubst point-at-eol (&optional N) + (save-excursion (end-of-line N) (point)))) + (error nil)) + (condition-case nil (require 'custom) (error nil)) (condition-case nil @@ -275,8 +287,19 @@ (eval-and-compile ;; Both xemacs and emacs (condition-case nil + (require 'diff) ;; diff-command and diff-switches + (error nil)) + (condition-case nil + (require 'compile) ;; compilation-error-regexp-alist-alist + (error nil)) + (condition-case nil (unless (fboundp 'buffer-chars-modified-tick) ;; Emacs 22 added (defmacro buffer-chars-modified-tick () (buffer-modified-tick))) + (error nil)) + ;; Added in Emacs 24.1 + (condition-case nil + (unless (fboundp 'prog-mode) + (define-derived-mode prog-mode fundamental-mode "Prog")) (error nil))) (eval-when-compile @@ -310,6 +333,14 @@ ;; `("Verilog" ("MA" ["SAA" nil :help "Help SAA"] ["SAB" nil :help "Help SAA"]) ;; "----" ["MB" nil :help "Help MB"])) +(defun verilog-define-abbrev (table name expansion &optional hook) + "Filter `define-abbrev' TABLE NAME EXPANSION and call HOOK. +Provides SYSTEM-FLAG in newer Emacs." + (condition-case nil + (define-abbrev table name expansion hook 0 t) + (error + (define-abbrev table name expansion hook)))) + (defun verilog-customize () "Customize variables and other settings used by Verilog-Mode." (interactive) @@ -335,9 +366,31 @@ ;; And GNU Emacs 22 has obsoleted last-command-char last-command-event))) -(defalias 'verilog-syntax-ppss - (if (fboundp 'syntax-ppss) 'syntax-ppss - (lambda (&optional pos) (parse-partial-sexp (point-min) (or pos (point)))))) +(defvar verilog-no-change-functions nil + "True if `after-change-functions' is disabled. +Use of `syntax-ppss' may break, as ppss's cache may get corrupted.") + +(defvar verilog-in-hooks nil + "True when within a `verilog-run-hooks' block.") + +(defmacro verilog-run-hooks (&rest hooks) + "Run each hook in HOOKS using `run-hooks'. +Set `verilog-in-hooks' during this time, to assist AUTO caches." + `(let ((verilog-in-hooks t)) + (run-hooks ,@hooks))) + +(defun verilog-syntax-ppss (&optional pos) + (when verilog-no-change-functions + (if verilog-in-hooks + (verilog-scan-cache-flush) + ;; else don't let the AUTO code itself get away with flushing the cache, + ;; as that'll make things very slow + (backtrace) + (error "%s: Internal problem; use of syntax-ppss when cache may be corrupt" + (verilog-point-text)))) + (if (fboundp 'syntax-ppss) + (syntax-ppss pos) + (parse-partial-sexp (point-min) (or pos (point))))) (defgroup verilog-mode nil "Facilitates easy editing of Verilog source text." @@ -631,6 +684,22 @@ :type 'boolean) (put 'verilog-highlight-includes 'safe-local-variable 'verilog-booleanp) +(defcustom verilog-auto-declare-nettype nil + "*Non-nil specifies the data type to use with `verilog-auto-input' etc. +Set this to \"wire\" if the Verilog code uses \"`default_nettype +none\". Note using `default_nettype none isn't recommended practice; this +mode is experimental." + :group 'verilog-mode-actions + :type 'boolean) +(put 'verilog-auto-declare-nettype 'safe-local-variable `stringp) + +(defcustom verilog-auto-wire-type nil + "*Non-nil specifies the data type to use with `verilog-auto-wire' etc. +Set this to \"logic\" for SystemVerilog code, or use `verilog-auto-logic'." + :group 'verilog-mode-actions + :type 'boolean) +(put 'verilog-auto-wire-type 'safe-local-variable `stringp) + (defcustom verilog-auto-endcomments t "*True means insert a comment /* ... */ after 'end's. The name of the function or case will be set between the braces." @@ -638,6 +707,12 @@ :type 'boolean) (put 'verilog-auto-endcomments 'safe-local-variable 'verilog-booleanp) +(defcustom verilog-auto-delete-trailing-whitespace nil + "*True means to `delete-trailing-whitespace' in `verilog-auto'." + :group 'verilog-mode-actions + :type 'boolean) +(put 'verilog-auto-delete-trailing-whitespace 'safe-local-variable 'verilog-booleanp) + (defcustom verilog-auto-ignore-concat nil "*True means ignore signals in {...} concatenations for AUTOWIRE etc. This will exclude signals referenced as pin connections in {...} @@ -696,6 +771,12 @@ (defvar verilog-auto-last-file-locals nil "Text from file-local-variables during last evaluation.") +(defvar verilog-diff-function 'verilog-diff-report + "*Function to run when `verilog-diff-auto' detects differences. +Function takes three arguments, the original buffer, the +difference buffer, and the point in original buffer with the +first difference.") + ;;; Compile support (require 'compile) (defvar verilog-error-regexp-added nil) @@ -896,6 +977,19 @@ :type 'boolean) (put 'verilog-auto-sense-defines-constant 'safe-local-variable 'verilog-booleanp) +(defcustom verilog-auto-reset-blocking-in-non t + "*If true, AUTORESET will reset those signals which were +assigned with blocking assignments (=) even in a block with +non-blocking assignments (<=). + +If nil, all blocking assigned signals are ignored when any +non-blocking assignment is in the AUTORESET block. This allows +blocking assignments to be used for temporary values and not have +those temporaries reset. See example in `verilog-auto-reset'." + :type 'boolean + :group 'verilog-mode-auto) +(put 'verilog-auto-reset-blocking-in-non 'safe-local-variable 'verilog-booleanp) + (defcustom verilog-auto-reset-widths t "*If true, AUTORESET should determine the width of signals. This is then used to set the width of the zero (32'h0 for example). This @@ -917,7 +1011,9 @@ Declaration order is advantageous with order based instantiations and is the default for backward compatibility. Sorted order reduces changes when declarations are moved around in a file, and -it's bad practice to rely on order based instantiations anyhow." +it's bad practice to rely on order based instantiations anyhow. + +See also `verilog-auto-inst-sort'." :group 'verilog-mode-auto :type 'boolean) (put 'verilog-auto-arg-sort 'safe-local-variable 'verilog-booleanp) @@ -969,6 +1065,18 @@ :type 'boolean) (put 'verilog-auto-inst-param-value 'safe-local-variable 'verilog-booleanp) +(defcustom verilog-auto-inst-sort nil + "*If set, AUTOINST signal names will be sorted, not in declaration order. +Also affects AUTOINSTPARAM. Declaration order is the default for +backward compatibility, and as some teams prefer signals that are +declared together to remain together. Sorted order reduces +changes when declarations are moved around in a file. + +See also `verilog-auto-arg-sort'." + :group 'verilog-mode-auto + :type 'boolean) +(put 'verilog-auto-inst-sort 'safe-local-variable 'verilog-booleanp) + (defcustom verilog-auto-inst-vector t "*If true, when creating default ports with AUTOINST, use bus subscripts. If nil, skip the subscript when it matches the entire bus as declared in @@ -981,12 +1089,20 @@ (defcustom verilog-auto-inst-template-numbers nil "*If true, when creating templated ports with AUTOINST, add a comment. -The comment will add the line number of the template that was used for that -port declaration. Setting this aids in debugging, but nil is suggested for -regular use to prevent large numbers of merge conflicts." + +If t, the comment will add the line number of the template that +was used for that port declaration. This setting is suggested +only for debugging use, as regular use may cause a large numbers +of merge conflicts. + +If 'lhs', the comment will show the left hand side of the +AUTO_TEMPLATE rule that is matched. This is less precise than +numbering (t) when multiple rules have the same pin name, but +won't merge conflict." :group 'verilog-mode-auto - :type 'boolean) -(put 'verilog-auto-inst-template-numbers 'safe-local-variable 'verilog-booleanp) + :type '(choice (const nil) (const t) (const lhs))) +(put 'verilog-auto-inst-template-numbers 'safe-local-variable + '(lambda (x) (memq x '(nil t lhs)))) (defcustom verilog-auto-inst-column 40 "*Indent-to column number for net name part of AUTOINST created pin." @@ -1015,6 +1131,14 @@ :type 'string) (put 'verilog-auto-output-ignore-regexp 'safe-local-variable 'stringp) +(defcustom verilog-auto-tieoff-declaration "wire" + "*Data type used for the declaration for AUTOTIEOFF. If \"wire\" then +create a wire, if \"assign\" create an assignment, else the data type for +variable creation." + :group 'verilog-mode-auto + :type 'string) +(put 'verilog-auto-tieoff-declaration 'safe-local-variable 'stringp) + (defcustom verilog-auto-tieoff-ignore-regexp nil "*If set, when creating AUTOTIEOFF list, ignore signals matching this regexp. See the \\[verilog-faq] for examples on using this." @@ -1114,8 +1238,10 @@ (define-key map "\M-\r" `electric-verilog-terminate-and-indent) (define-key map "\M-\t" 'verilog-complete-word) (define-key map "\M-?" 'verilog-show-completions) + ;; Note \C-c and letter are reserved for users (define-key map "\C-c\`" 'verilog-lint-off) (define-key map "\C-c\*" 'verilog-delete-auto-star-implicit) + (define-key map "\C-c\?" 'verilog-diff-auto) (define-key map "\C-c\C-r" 'verilog-label-be) (define-key map "\C-c\C-i" 'verilog-pretty-declarations) (define-key map "\C-c=" 'verilog-pretty-expr) @@ -1241,6 +1367,8 @@ :help "Expand AUTO meta-comment statements"] ["Kill AUTOs" verilog-delete-auto :help "Remove AUTO expansions"] + ["Diff AUTOs" verilog-diff-auto + :help "Show differences in AUTO expansions"] ["Inject AUTOs" verilog-inject-auto :help "Inject AUTOs into legacy non-AUTO buffer"] ("AUTO Help..." @@ -1264,6 +1392,8 @@ :help "Help on AUTOASCIIENUM - creating ASCII for enumerations"] ["AUTOINOUTCOMP" (describe-function 'verilog-auto-inout-comp) :help "Help on AUTOINOUTCOMP - copying complemented i/o from another file"] + ["AUTOINOUTIN" (describe-function 'verilog-auto-inout-in) + :help "Help on AUTOINOUTCOMP - copying i/o from another file as all inputs"] ["AUTOINOUTMODULE" (describe-function 'verilog-auto-inout-module) :help "Help on AUTOINOUTMODULE - copying i/o from another file"] ["AUTOINSERTLISP" (describe-function 'verilog-auto-insert-lisp) @@ -1278,6 +1408,8 @@ :help "Help on expanding Verilog-2001 .* pins"] ["AUTOINSTPARAM" (describe-function 'verilog-auto-inst-param) :help "Help on AUTOINSTPARAM - adding parameter pins to cells"] + ["AUTOLOGIC" (describe-function 'verilog-auto-logic) + :help "Help on AUTOLOGIC - declaring logic signals"] ["AUTOOUTPUT" (describe-function 'verilog-auto-output) :help "Help on AUTOOUTPUT - adding outputs from cells"] ["AUTOOUTPUTEVERY" (describe-function 'verilog-auto-output-every) @@ -1318,6 +1450,10 @@ "----" ["Module" verilog-sk-module :help "Insert a module .. (/*AUTOARG*/);.. endmodule block"] + ["OVM Class" verilog-sk-ovm-class + :help "Insert an OVM class block"] + ["UVM Class" verilog-sk-uvm-class + :help "Insert an UVM class block"] ["Primitive" verilog-sk-primitive :help "Insert a primitive .. (.. );.. endprimitive block"] "----" @@ -1372,6 +1508,31 @@ "Abbrev table in use in Verilog-mode buffers.") (define-abbrev-table 'verilog-mode-abbrev-table ()) +(verilog-define-abbrev verilog-mode-abbrev-table "class" "" 'verilog-sk-ovm-class) +(verilog-define-abbrev verilog-mode-abbrev-table "always" "" 'verilog-sk-always) +(verilog-define-abbrev verilog-mode-abbrev-table "begin" nil `verilog-sk-begin) +(verilog-define-abbrev verilog-mode-abbrev-table "case" "" `verilog-sk-case) +(verilog-define-abbrev verilog-mode-abbrev-table "for" "" `verilog-sk-for) +(verilog-define-abbrev verilog-mode-abbrev-table "generate" "" `verilog-sk-generate) +(verilog-define-abbrev verilog-mode-abbrev-table "initial" "" `verilog-sk-initial) +(verilog-define-abbrev verilog-mode-abbrev-table "fork" "" `verilog-sk-fork) +(verilog-define-abbrev verilog-mode-abbrev-table "module" "" `verilog-sk-module) +(verilog-define-abbrev verilog-mode-abbrev-table "primitive" "" `verilog-sk-primitive) +(verilog-define-abbrev verilog-mode-abbrev-table "repeat" "" `verilog-sk-repeat) +(verilog-define-abbrev verilog-mode-abbrev-table "specify" "" `verilog-sk-specify) +(verilog-define-abbrev verilog-mode-abbrev-table "task" "" `verilog-sk-task) +(verilog-define-abbrev verilog-mode-abbrev-table "while" "" `verilog-sk-while) +(verilog-define-abbrev verilog-mode-abbrev-table "casex" "" `verilog-sk-casex) +(verilog-define-abbrev verilog-mode-abbrev-table "casez" "" `verilog-sk-casez) +(verilog-define-abbrev verilog-mode-abbrev-table "if" "" `verilog-sk-if) +(verilog-define-abbrev verilog-mode-abbrev-table "else if" "" `verilog-sk-else-if) +(verilog-define-abbrev verilog-mode-abbrev-table "assign" "" `verilog-sk-assign) +(verilog-define-abbrev verilog-mode-abbrev-table "function" "" `verilog-sk-function) +(verilog-define-abbrev verilog-mode-abbrev-table "input" "" `verilog-sk-input) +(verilog-define-abbrev verilog-mode-abbrev-table "output" "" `verilog-sk-output) +(verilog-define-abbrev verilog-mode-abbrev-table "inout" "" `verilog-sk-inout) +(verilog-define-abbrev verilog-mode-abbrev-table "wire" "" `verilog-sk-wire) +(verilog-define-abbrev verilog-mode-abbrev-table "reg" "" `verilog-sk-reg) ;; ;; Macros @@ -1386,6 +1547,9 @@ The case (verilog-string-replace-matches \"o\" \"oo\" nil nil \"foobar\") will break, as the o's continuously replace. xa -> x works ok though." ;; Hopefully soon to a emacs built-in + ;; Also note \ in the replacement prevent multiple replacements; IE + ;; (verilog-string-replace-matches "@" "\\\\([0-9]+\\\\)" nil nil "wire@_@") + ;; Gives "wire\([0-9]+\)_@" not "wire\([0-9]+\)_\([0-9]+\)" (let ((start 0)) (while (string-match from-string string start) (setq string (replace-match to-string fixedcase literal string) @@ -1434,26 +1598,28 @@ (defsubst verilog-re-search-forward-quick (regexp bound noerror) "Like `verilog-re-search-forward', including use of REGEXP BOUND and NOERROR, but trashes match data and is faster for REGEXP that doesn't match often. -This may at some point use text properties to ignore comments, +This uses `verilog-scan' and text properties to ignore comments, so there may be a large up front penalty for the first search." (let (pt) (while (and (not pt) (re-search-forward regexp bound noerror)) - (if (not (verilog-inside-comment-p)) - (setq pt (match-end 0)))) + (if (verilog-inside-comment-or-string-p) + (re-search-forward "[/\"\n]" nil t) ;; Only way a comment or quote can end + (setq pt (match-end 0)))) pt)) (defsubst verilog-re-search-backward-quick (regexp bound noerror) ; checkdoc-params: (REGEXP BOUND NOERROR) "Like `verilog-re-search-backward', including use of REGEXP BOUND and NOERROR, but trashes match data and is faster for REGEXP that doesn't match often. -This may at some point use text properties to ignore comments, +This uses `verilog-scan' and text properties to ignore comments, so there may be a large up front penalty for the first search." (let (pt) (while (and (not pt) (re-search-backward regexp bound noerror)) - (if (not (verilog-inside-comment-p)) - (setq pt (match-end 0)))) + (if (verilog-inside-comment-or-string-p) + (re-search-backward "[/\"]" nil t) ;; Only way a comment or quote can begin + (setq pt (match-beginning 0)))) pt)) (defsubst verilog-re-search-forward-substr (substr regexp bound noerror) @@ -1496,6 +1662,14 @@ done)) ;;(verilog-re-search-backward-substr "-end" "get-end-of" nil t) ;;-end (test bait) +(defun verilog-delete-trailing-whitespace () + "Delete trailing spaces or tabs, but not newlines nor linefeeds." + ;; Similar to `delete-trailing-whitespace' but that's not present in XEmacs + (save-excursion + (goto-char (point-min)) + (while (re-search-forward "[ \t]+$" nil t) ;; Not syntatic WS as no formfeed + (replace-match "" nil nil)))) + (defvar compile-command) ;; compilation program @@ -1535,11 +1709,11 @@ (set (make-local-variable 'compile-command) "make ")) (t (set (make-local-variable 'compile-command) - (if verilog-tool - (if (string-match "%s" (eval verilog-tool)) - (format (eval verilog-tool) (or buffer-file-name "")) - (concat (eval verilog-tool) " " (or buffer-file-name ""))) - "")))) + (if verilog-tool + (if (string-match "%s" (eval verilog-tool)) + (format (eval verilog-tool) (or buffer-file-name "")) + (concat (eval verilog-tool) " " (or buffer-file-name ""))) + "")))) (verilog-modify-compile-command)) (defun verilog-expand-command (command) @@ -1564,7 +1738,7 @@ (stringp compile-command) (string-match "\\b\\(__FLAGS__\\|__FILE__\\)\\b" compile-command)) (set (make-local-variable 'compile-command) - (verilog-expand-command compile-command)))) + (verilog-expand-command compile-command)))) (if (featurep 'xemacs) ;; Following code only gets called from compilation-mode-hook on XEmacs to add error handling. @@ -1585,8 +1759,8 @@ (cdr compilation-error-regexp-alist-alist))))) (if (boundp 'compilation-font-lock-keywords) (progn - (set (make-local-variable 'compilation-font-lock-keywords) - verilog-error-font-lock-keywords) + (set (make-local-variable 'compilation-font-lock-keywords) + verilog-error-font-lock-keywords) (font-lock-set-defaults))) ;; Need to re-run compilation-error-regexp builder (if (fboundp 'compilation-build-compilation-error-regexp-alist) @@ -1657,6 +1831,30 @@ "`ovm_sequencer_utils_end" ) nil ))) +(defconst verilog-uvm-begin-re + (eval-when-compile + (verilog-regexp-opt + '( + "`uvm_component_utils_begin" + "`uvm_component_param_utils_begin" + "`uvm_field_utils_begin" + "`uvm_object_utils_begin" + "`uvm_object_param_utils_begin" + "`uvm_sequence_utils_begin" + "`uvm_sequencer_utils_begin" + ) nil ))) + +(defconst verilog-uvm-end-re + (eval-when-compile + (verilog-regexp-opt + '( + "`uvm_component_utils_end" + "`uvm_field_utils_end" + "`uvm_object_utils_end" + "`uvm_sequence_utils_end" + "`uvm_sequencer_utils_end" + ) nil ))) + (defconst verilog-vmm-begin-re (eval-when-compile (verilog-regexp-opt @@ -1794,6 +1992,145 @@ "`static_dut_error" "`static_message") nil ))) +(defconst verilog-uvm-statement-re + (eval-when-compile + (verilog-regexp-opt + '( + ;; Statements + "`uvm_analysis_imp_decl" + "`uvm_blocking_get_imp_decl" + "`uvm_blocking_get_peek_imp_decl" + "`uvm_blocking_master_imp_decl" + "`uvm_blocking_peek_imp_decl" + "`uvm_blocking_put_imp_decl" + "`uvm_blocking_slave_imp_decl" + "`uvm_blocking_transport_imp_decl" + "`uvm_component_param_utils" + "`uvm_component_registry" + "`uvm_component_registry_param" + "`uvm_component_utils" + "`uvm_create" + "`uvm_create_on" + "`uvm_create_seq" ;; Undocumented in 1.1 + "`uvm_declare_p_sequencer" + "`uvm_declare_sequence_lib" ;; Deprecated in 1.1 + "`uvm_do" + "`uvm_do_callbacks" + "`uvm_do_callbacks_exit_on" + "`uvm_do_obj_callbacks" + "`uvm_do_obj_callbacks_exit_on" + "`uvm_do_on" + "`uvm_do_on_pri" + "`uvm_do_on_pri_with" + "`uvm_do_on_with" + "`uvm_do_pri" + "`uvm_do_pri_with" + "`uvm_do_seq" ;; Undocumented in 1.1 + "`uvm_do_seq_with" ;; Undocumented in 1.1 + "`uvm_do_with" + "`uvm_error" + "`uvm_error_context" + "`uvm_fatal" + "`uvm_fatal_context" + "`uvm_field_aa_int_byte" + "`uvm_field_aa_int_byte_unsigned" + "`uvm_field_aa_int_enum" + "`uvm_field_aa_int_int" + "`uvm_field_aa_int_int_unsigned" + "`uvm_field_aa_int_integer" + "`uvm_field_aa_int_integer_unsigned" + "`uvm_field_aa_int_key" + "`uvm_field_aa_int_longint" + "`uvm_field_aa_int_longint_unsigned" + "`uvm_field_aa_int_shortint" + "`uvm_field_aa_int_shortint_unsigned" + "`uvm_field_aa_int_string" + "`uvm_field_aa_object_int" + "`uvm_field_aa_object_string" + "`uvm_field_aa_string_int" + "`uvm_field_aa_string_string" + "`uvm_field_array_enum" + "`uvm_field_array_int" + "`uvm_field_array_object" + "`uvm_field_array_string" + "`uvm_field_enum" + "`uvm_field_event" + "`uvm_field_int" + "`uvm_field_object" + "`uvm_field_queue_enum" + "`uvm_field_queue_int" + "`uvm_field_queue_object" + "`uvm_field_queue_string" + "`uvm_field_real" + "`uvm_field_sarray_enum" + "`uvm_field_sarray_int" + "`uvm_field_sarray_object" + "`uvm_field_sarray_string" + "`uvm_field_string" + "`uvm_field_utils" + "`uvm_file" ;; Undocumented in 1.1, use `__FILE__ + "`uvm_get_imp_decl" + "`uvm_get_peek_imp_decl" + "`uvm_info" + "`uvm_info_context" + "`uvm_line" ;; Undocumented in 1.1, use `__LINE__ + "`uvm_master_imp_decl" + "`uvm_non_blocking_transport_imp_decl" ;; Deprecated in 1.1 + "`uvm_nonblocking_get_imp_decl" + "`uvm_nonblocking_get_peek_imp_decl" + "`uvm_nonblocking_master_imp_decl" + "`uvm_nonblocking_peek_imp_decl" + "`uvm_nonblocking_put_imp_decl" + "`uvm_nonblocking_slave_imp_decl" + "`uvm_nonblocking_transport_imp_decl" + "`uvm_object_param_utils" + "`uvm_object_registry" + "`uvm_object_registry_param" ;; Undocumented in 1.1 + "`uvm_object_utils" + "`uvm_pack_array" + "`uvm_pack_arrayN" + "`uvm_pack_enum" + "`uvm_pack_enumN" + "`uvm_pack_int" + "`uvm_pack_intN" + "`uvm_pack_queue" + "`uvm_pack_queueN" + "`uvm_pack_real" + "`uvm_pack_sarray" + "`uvm_pack_sarrayN" + "`uvm_pack_string" + "`uvm_peek_imp_decl" + "`uvm_put_imp_decl" + "`uvm_rand_send" + "`uvm_rand_send_pri" + "`uvm_rand_send_pri_with" + "`uvm_rand_send_with" + "`uvm_record_attribute" + "`uvm_record_field" + "`uvm_register_cb" + "`uvm_send" + "`uvm_send_pri" + "`uvm_sequence_utils" ;; Deprecated in 1.1 + "`uvm_set_super_type" + "`uvm_slave_imp_decl" + "`uvm_transport_imp_decl" + "`uvm_unpack_array" + "`uvm_unpack_arrayN" + "`uvm_unpack_enum" + "`uvm_unpack_enumN" + "`uvm_unpack_int" + "`uvm_unpack_intN" + "`uvm_unpack_queue" + "`uvm_unpack_queueN" + "`uvm_unpack_real" + "`uvm_unpack_sarray" + "`uvm_unpack_sarrayN" + "`uvm_unpack_string" + "`uvm_update_sequence_lib" ;; Deprecated in 1.1 + "`uvm_update_sequence_lib_and_item" ;; Deprecated in 1.1 + "`uvm_warning" + "`uvm_warning_context") nil ))) + ;; ;; Regular expressions used to calculate indent, etc. @@ -1805,6 +2142,29 @@ ;; a[34:32] : ;; a, ;; b : +(defconst verilog-assignment-operator-re + (eval-when-compile + (verilog-regexp-opt + `( + ;; blocking assignment_operator + "=" "+=" "-=" "*=" "/=" "%=" "&=" "|=" "^=" "<<=" ">>=" "<<<=" ">>>=" + ;; non blocking assignment operator + "<=" + ;; comparison + "==" "!=" "===" "!===" "<=" ">=" "==\?" "!=\?" + ;; event_trigger + "->" "->>" + ;; property_expr + "|->" "|=>" + ;; Is this a legal verilog operator? + ":=" + ) 't + ))) +(defconst verilog-assignment-operation-re + (concat +; "\\(^\\s-*[A-Za-z0-9_]+\\(\\[\\([A-Za-z0-9_]+\\)\\]\\)*\\s-*\\)" +; "\\(^\\s-*[^=<>+-*/%&|^:\\s-]+[^=<>+-*/%&|^\n]*?\\)" + "\\(^.*?\\)" "\\B" verilog-assignment-operator-re "\\B" )) (defconst verilog-label-re (concat verilog-symbol-re "\\s-*:\\s-*")) (defconst verilog-property-re @@ -1843,7 +2203,12 @@ "\\(\\<`ovm_object_utils_end\\>\\)\\|" "\\(\\<`ovm_sequence_utils_end\\>\\)\\|" "\\(\\<`ovm_sequencer_utils_end\\>\\)" - + ;; UVM + "\\(\\<`uvm_component_utils_end\\>\\)\\|" + "\\(\\<`uvm_field_utils_end\\>\\)\\|" + "\\(\\<`uvm_object_utils_end\\>\\)\\|" + "\\(\\<`uvm_sequence_utils_end\\>\\)\\|" + "\\(\\<`uvm_sequencer_utils_end\\>\\)" )) (defconst verilog-auto-end-comment-lines-re @@ -1925,6 +2290,12 @@ "`ovm_object_utils_end" "`ovm_sequence_utils_end" "`ovm_sequencer_utils_end" + ;; UVM + "`uvm_component_utils_end" + "`uvm_field_utils_end" + "`uvm_object_utils_end" + "`uvm_sequence_utils_end" + "`uvm_sequencer_utils_end" ;; VMM "`vmm_data_member_end" "`vmm_env_member_end" @@ -1979,7 +2350,7 @@ "specify" "table" "task" - ;;; OVM + ;; OVM "`ovm_component_utils_begin" "`ovm_component_param_utils_begin" "`ovm_field_utils_begin" @@ -1987,6 +2358,14 @@ "`ovm_object_param_utils_begin" "`ovm_sequence_utils_begin" "`ovm_sequencer_utils_begin" + ;; UVM + "`uvm_component_utils_begin" + "`uvm_component_param_utils_begin" + "`uvm_field_utils_begin" + "`uvm_object_utils_begin" + "`uvm_object_param_utils_begin" + "`uvm_sequence_utils_begin" + "`uvm_sequencer_utils_begin" ;; VMM "`vmm_data_member_begin" "`vmm_env_member_begin" @@ -2000,7 +2379,7 @@ (defconst verilog-beg-block-re-ordered ( concat "\\(\\\\)" ;1 "\\|\\(\\\\|\\(\\\\)" ; 2,3 - "\\|\\(\\(\\\\s-+\\)?fork\\>\\)" ;4,5 + "\\|\\(\\(\\\\s-+\\|\\\\s-+\\)?fork\\>\\)" ;4,5 "\\|\\(\\\\)" ;6 "\\|\\(\\\\)" ;7 "\\|\\(\\\\)" ;8 @@ -2013,7 +2392,7 @@ "\\|\\(\\(\\(\\\\s-+\\)\\|\\(\\\\s-+\\)\\)*\\\\)" ;17 21 "\\|\\(\\<\\(rand\\)?sequence\\>\\)" ;21 25 "\\|\\(\\\\)" ;22 27 - "\\|\\(\\<`ovm_[a-z_]+_begin\\>\\)" ;28 + "\\|\\(\\<`[ou]vm_[a-z_]+_begin\\>\\)" ;28 "\\|\\(\\<`vmm_[a-z_]+_member_begin\\>\\)" ;; @@ -2125,6 +2504,8 @@ (eval-when-compile (verilog-regexp-words `("endmodule" "endclass" "endprogram" "endinterface" "endpackage" "endprimitive" "endconfig")))) (defconst verilog-zero-indent-re (concat verilog-defun-re "\\|" verilog-end-defun-re)) +(defconst verilog-inst-comment-re + (eval-when-compile (verilog-regexp-words `("Outputs" "Inouts" "Inputs" "Interfaces" "Interfaced")))) (defconst verilog-behavioral-block-beg-re (eval-when-compile (verilog-regexp-words `("initial" "final" "always" "always_comb" "always_latch" "always_ff" @@ -2186,6 +2567,20 @@ "`ovm_object_utils_end" "`ovm_sequence_utils_end" "`ovm_sequencer_utils_end" + ;; UVM Begin tokens + "`uvm_component_utils_begin" + "`uvm_component_param_utils_begin" + "`uvm_field_utils_begin" + "`uvm_object_utils_begin" + "`uvm_object_param_utils_begin" + "`uvm_sequence_utils_begin" + "`uvm_sequencer_utils_begin" + ;; UVM End tokens + "`uvm_component_utils_end" ;; Typo in spec, it's not uvm_component_end + "`uvm_field_utils_end" + "`uvm_object_utils_end" + "`uvm_sequence_utils_end" + "`uvm_sequencer_utils_end" ;; VMM Begin tokens "`vmm_data_member_begin" "`vmm_env_member_begin" @@ -2227,8 +2622,7 @@ `( "endmodule" "endprimitive" "endinterface" "endpackage" "endprogram" "endclass" )))) -(defconst verilog-disable-fork-re "disable\\s-+fork\\>") -(defconst verilog-fork-wait-re "fork\\s-+wait\\>") +(defconst verilog-disable-fork-re "\\(disable\\|wait\\)\\s-+fork\\>") (defconst verilog-extended-case-re "\\(unique\\s-+\\|priority\\s-+\\)?case[xz]?") (defconst verilog-extended-complete-re (concat "\\(\\\\s-+\\)?virtual\\s-+\\|\\\\|\\\\)" @@ -2609,6 +3003,7 @@ (buffer-undo-list t) (inhibit-read-only t) (inhibit-point-motion-hooks t) + (verilog-no-change-functions t) before-change-functions after-change-functions deactivate-mark @@ -2624,6 +3019,7 @@ "Execute BODY forms, disabling all change hooks in BODY. For insignificant changes, see instead `verilog-save-buffer-state'." `(let* ((inhibit-point-motion-hooks t) + (verilog-no-change-functions t) before-change-functions after-change-functions) (progn ,@body))) @@ -2633,13 +3029,17 @@ (defvar verilog-scan-cache-preserving nil "If set, the specified buffer's comment properties are static. -Buffer changes will be ignored. See `verilog-inside-comment-p' +Buffer changes will be ignored. See `verilog-inside-comment-or-string-p' and `verilog-scan'.") (defvar verilog-scan-cache-tick nil "Modification tick at which `verilog-scan' was last completed.") (make-variable-buffer-local 'verilog-scan-cache-tick) +(defun verilog-scan-cache-flush () + "Flush the `verilog-scan' cache." + (setq verilog-scan-cache-tick nil)) + (defun verilog-scan-cache-ok-p () "Return t iff the scan cache is up to date." (or (and verilog-scan-cache-preserving @@ -2660,8 +3060,8 @@ (progn ,@body)))) (defun verilog-scan-region (beg end) - "Parse comments between BEG and END for `verilog-inside-comment-p'. -This creates v-cmt properties where comments are in force." + "Parse between BEG and END for `verilog-inside-comment-or-string-p'. +This creates v-cmts properties where comments are in force." ;; Why properties and not overlays? Overlays have much slower non O(1) ;; lookup times. ;; This function is warm - called on every verilog-insert @@ -2678,8 +3078,9 @@ ;; "1+": The leading // or /* itself isn't considered as ;; being "inside" the comment, so that a (search-backward) ;; that lands at the start of the // won't mis-indicate - ;; it's inside a comment - (put-text-property (1+ pt) (point) 'v-cmt t)) + ;; it's inside a comment. Also otherwise it would be + ;; hard to find a commented out /*AS*/ vs one that isn't + (put-text-property (1+ pt) (point) 'v-cmts t)) ((looking-at "/\\*") (setq pt (point)) (or (search-forward "*/" end t) @@ -2688,17 +3089,24 @@ ;;(error "%s: Unmatched /* */, at char %d" ;; (verilog-point-text) (point)) (goto-char end)) - (put-text-property (1+ pt) (point) 'v-cmt t)) + (put-text-property (1+ pt) (point) 'v-cmts t)) + ((looking-at "\"") + (setq pt (point)) + (or (re-search-forward "[^\\]\"" end t) ;; don't forward-char first, since we look for a non backslash first + ;; No error - let later code indicate it so we can + (goto-char end)) + (put-text-property (1+ pt) (point) 'v-cmts t)) (t (forward-char 1) - (if (re-search-forward "/[/*]" end t) - (backward-char 2) + (if (re-search-forward "[/\"]" end t) + (backward-char 1) (goto-char end)))))))))) (defun verilog-scan () "Parse the buffer, marking all comments with properties. Also assumes any text inserted since `verilog-scan-cache-tick' either is ok to parse as a non-comment, or `verilog-insert' was used." + ;; See also `verilog-scan-debug' and `verilog-scan-and-debug' (unless (verilog-scan-cache-ok-p) (save-excursion (verilog-save-buffer-state @@ -2706,21 +3114,47 @@ (message "Scanning %s cache=%s cachetick=%S tick=%S" (current-buffer) verilog-scan-cache-preserving verilog-scan-cache-tick (buffer-chars-modified-tick))) - (remove-text-properties (point-min) (point-max) '(v-cmt nil)) + (remove-text-properties (point-min) (point-max) '(v-cmts nil)) (verilog-scan-region (point-min) (point-max)) (setq verilog-scan-cache-tick (buffer-chars-modified-tick)) (when verilog-debug (message "Scanning... done")))))) -(defun verilog-inside-comment-p () - "Check if point inside a comment. +(defun verilog-scan-debug () + "For debugging, show with display face results of `verilog-scan'." + (font-lock-mode 0) + ;;(if dbg (setq dbg (concat dbg (format "verilog-scan-debug\n")))) + (save-excursion + (goto-char (point-min)) + (remove-text-properties (point-min) (point-max) '(face nil)) + (while (not (eobp)) + (cond ((get-text-property (point) 'v-cmts) + (put-text-property (point) (1+ (point)) `face 'underline) + ;;(if dbg (setq dbg (concat dbg (format " v-cmts at %S\n" (point))))) + (forward-char 1)) + (t + (goto-char (or (next-property-change (point)) (point-max)))))))) + +(defun verilog-scan-and-debug () + "For debugging, run `verilog-scan' and `verilog-scan-debug'." + (let (verilog-scan-cache-preserving + verilog-scan-cache-tick) + (goto-char (point-min)) + (verilog-scan) + (verilog-scan-debug))) + +(defun verilog-inside-comment-or-string-p (&optional pos) + "Check if optional point POS is inside a comment. This may require a slow pre-parse of the buffer with `verilog-scan' to establish comment properties on all text." ;; This function is very hot (verilog-scan) - (get-text-property (point) 'v-cmt)) + (if pos + (and (>= pos (point-min)) + (get-text-property pos 'v-cmts)) + (get-text-property (point) 'v-cmts))) (defun verilog-insert (&rest stuff) - "Insert STUFF arguments, tracking comments for `verilog-inside-comment-p'. + "Insert STUFF arguments, tracking for `verilog-inside-comment-or-string-p'. Any insert that includes a comment must have the entire commente inserted using a single call to `verilog-insert'." (let ((pt (point))) @@ -2741,7 +3175,7 @@ (buffer-name)) buffer-file-name (buffer-name)) - ":" (int-to-string (count-lines (point-min) (or pointnum (point)))))) + ":" (int-to-string (1+ (count-lines (point-min) (or pointnum (point))))))) (defun electric-verilog-backward-sexp () "Move backward over one balanced expression." @@ -2835,28 +3269,24 @@ (setq md 3) ;; ender is third item in regexp ) ((match-end 4) - ;; might be "disable fork" or "fork wait" + ;; might be "disable fork" or "wait fork" (let (here) - (if (looking-at verilog-fork-wait-re) - (progn ;; it is a fork wait; ignore it + (if (or + (looking-at verilog-disable-fork-re) + (and (looking-at "fork") + (progn + (setq here (point)) ;; sometimes a fork is just a fork + (forward-word -1) + (looking-at verilog-disable-fork-re)))) + (progn ;; it is a disable fork; ignore it (goto-char (match-end 0)) + (forward-word 1) (setq reg nil)) - (if (or - (looking-at verilog-disable-fork-re) - (and (looking-at "fork") - (progn - (setq here (point)) ;; sometimes a fork is just a fork - (forward-word -1) - (looking-at verilog-disable-fork-re)))) - (progn ;; it is a disable fork; ignore it - (goto-char (match-end 0)) - (forward-word 1) - (setq reg nil)) - (progn ;; it is a nice simple fork - (goto-char here) ;; return from looking for "disable fork" - ;; Search forward for matching join - (setq reg "\\(\\\\)\\|\\(\\\\)" )))))) + (progn ;; it is a nice simple fork + (goto-char here) ;; return from looking for "disable fork" + ;; Search forward for matching join + (setq reg "\\(\\\\)\\|\\(\\\\)" ))))) ((match-end 6) ;; Search forward for matching endclass (setq reg "\\(\\\\)\\|\\(\\\\)" )) @@ -2916,8 +3346,6 @@ (setq here (point)) ; remember where we started (goto-char (match-beginning 1)) (cond - ((looking-at verilog-fork-wait-re) - (goto-char (match-end 0))) ; false alarm ((if (or (looking-at verilog-disable-fork-re) (and (looking-at "fork") @@ -3076,6 +3504,8 @@ \\[verilog-sk-initial] Insert an initial begin .. end block. \\[verilog-sk-fork] Insert a fork begin .. end .. join block. \\[verilog-sk-module] Insert a module .. (/*AUTOARG*/);.. endmodule block. + \\[verilog-sk-ovm-class] Insert an OVM Class block. + \\[verilog-sk-uvm-class] Insert an UVM Class block. \\[verilog-sk-primitive] Insert a primitive .. (.. );.. endprimitive block. \\[verilog-sk-repeat] Insert a repeat (..) begin .. end block. \\[verilog-sk-specify] Insert a specify .. endspecify block. @@ -3110,7 +3540,6 @@ #'verilog-indent-line-relative) (setq comment-indent-function 'verilog-comment-indent) (set (make-local-variable 'parse-sexp-ignore-comments) nil) - (set (make-local-variable 'comment-start) "// ") (set (make-local-variable 'comment-end) "") (set (make-local-variable 'comment-start-skip) "/\\*+ *\\|// *") @@ -3168,7 +3597,9 @@ hs-special-modes-alist)))) ;; Stuff for autos - (add-hook 'write-contents-hooks 'verilog-auto-save-check nil 'local)) + (add-hook 'write-contents-hooks 'verilog-auto-save-check nil 'local) + ;; verilog-mode-hook call added by define-derived-mode + ) ;; @@ -3519,6 +3950,12 @@ (interactive) (verilog-re-search-backward verilog-defun-re nil 'move)) +(defun verilog-beg-of-defun-quick () + "Move backward to the beginning of the current function or procedure. +Uses `verilog-scan' cache." + (interactive) + (verilog-re-search-backward-quick verilog-defun-re nil 'move)) + (defun verilog-end-of-defun () "Move forward to the end of the current function or procedure." (interactive) @@ -3741,13 +4178,21 @@ (t (throw 'found (= nest 0))))))) nil))) + (defun verilog-backward-up-list (arg) - "Like backward-up-list, but deal with comments." - (let (saved-psic parse-sexp-ignore-comments) - (setq parse-sexp-ignore-comments 1) - (backward-up-list arg) - (setq parse-sexp-ignore-comments saved-psic) - )) + "Like `backward-up-list', but deal with comments." + (let ((parse-sexp-ignore-comments t)) + (backward-up-list arg))) + +(defun verilog-forward-sexp-cmt (arg) + "Call `forward-sexp', inside comments." + (let ((parse-sexp-ignore-comments nil)) + (forward-sexp arg))) + +(defun verilog-forward-sexp-ign-cmt (arg) + "Call `forward-sexp', ignoring comments." + (let ((parse-sexp-ignore-comments t)) + (forward-sexp arg))) (defun verilog-in-struct-region-p () "Return true if in a struct region. @@ -4449,7 +4894,6 @@ next-error-last-buffer compilation-last-buffer))) (when (buffer-live-p buff) - ;; FIXME with-current-buffer? (save-excursion (switch-to-buffer buff) (beginning-of-line) @@ -4565,8 +5009,9 @@ (error "%%Error: %s%s" (error-message-string err) (if (featurep 'xemacs) "\n" ""))))) ;; XEmacs forgets to add a newline -(defun verilog-batch-execute-func (funref) - "Internal processing of a batch command, running FUNREF on all command arguments." +(defun verilog-batch-execute-func (funref &optional no-save) + "Internal processing of a batch command, running FUNREF on all command arguments. +Save the result unless optional NO-SAVE is t." (verilog-batch-error-wrapper ;; Setting global variables like that is *VERY NASTY* !!! --Stef ;; However, this function is called only when Emacs is being used as @@ -4587,15 +5032,15 @@ (buffer-list)) ;; Process the files (mapcar (lambda (buf) - (when (buffer-file-name buf) - (save-excursion - (if (not (file-exists-p (buffer-file-name buf))) - (error - (concat "File not found: " (buffer-file-name buf)))) - (message (concat "Processing " (buffer-file-name buf))) - (set-buffer buf) - (funcall funref) - (save-buffer)))) + (when (buffer-file-name buf) + (save-excursion + (if (not (file-exists-p (buffer-file-name buf))) + (error + (concat "File not found: " (buffer-file-name buf)))) + (message (concat "Processing " (buffer-file-name buf))) + (set-buffer buf) + (funcall funref) + (unless no-save (save-buffer))))) (buffer-list)))) (defun verilog-batch-auto () @@ -4616,6 +5061,16 @@ (error "Use verilog-batch-delete-auto only with --batch")) ;; Otherwise we'd mess up buffer modes (verilog-batch-execute-func `verilog-delete-auto)) +(defun verilog-batch-diff-auto () + "For use with --batch, perform automatic differences as a stand-alone tool. +This sets up the appropriate Verilog mode environment, expand automatics +with \\[verilog-diff-auto] on all command-line files, and reports an error +if any differences are observed. This is appropriate for adding to regressions +to insure automatics are always properly maintained." + (unless noninteractive + (error "Use verilog-batch-diff-auto only with --batch")) ;; Otherwise we'd mess up buffer modes + (verilog-batch-execute-func `verilog-diff-auto t)) + (defun verilog-batch-inject-auto () "For use with --batch, perform automatic injection as a stand-alone tool. This sets up the appropriate Verilog mode environment, injects new automatics @@ -4627,7 +5082,7 @@ (verilog-batch-execute-func `verilog-inject-auto)) (defun verilog-batch-indent () - "For use with --batch, reindent an entire file as a stand-alone tool. + "For use with --batch, reindent an a entire file as a stand-alone tool. This sets up the appropriate Verilog mode environment, calls \\[verilog-indent-buffer] on all command-line files, and saves the buffers." (unless noninteractive @@ -4692,123 +5147,123 @@ ;; if we have a directive, done. (if (save-excursion (beginning-of-line) (and (looking-at verilog-directive-re-1) - (not (or (looking-at "[ \t]*`ovm_") + (not (or (looking-at "[ \t]*`[ou]vm_") (looking-at "[ \t]*`vmm_"))))) (throw 'nesting 'directive)) ;; indent structs as if there were module level (if (verilog-in-struct-p) (throw 'nesting 'block)) - ;; unless we are in the newfangled coverpoint or constraint blocks - ;; if we are in a parenthesized list, and the user likes to indent these, return. - (if (and + ;; if we are in a parenthesized list, and the user likes to indent these, return. + ;; unless we are in the newfangled coverpoint or constraint blocks + (if (and verilog-indent-lists (verilog-in-paren) (not (verilog-in-coverage-p)) ) - (progn (setq par 1) + (progn (setq par 1) (throw 'nesting 'block))) - ;; See if we are continuing a previous line - (while t - ;; trap out if we crawl off the top of the buffer - (if (bobp) (throw 'nesting 'cpp)) - - (if (verilog-continued-line-1 lim) - (let ((sp (point))) - (if (and - (not (looking-at verilog-complete-reg)) - (verilog-continued-line-1 lim)) - (progn (goto-char sp) - (throw 'nesting 'cexp)) - - (goto-char sp)) - - (if (and begin - (not verilog-indent-begin-after-if) - (looking-at verilog-no-indent-begin-re)) - (progn - (beginning-of-line) - (skip-chars-forward " \t") - (throw 'nesting 'statement)) - (progn - (throw 'nesting 'cexp)))) - ;; not a continued line - (goto-char starting_position)) - - (if (looking-at "\\") - ;; search back for governing if, striding across begin..end pairs - ;; appropriately - (let ((elsec 1)) - (while (verilog-re-search-backward verilog-ends-re nil 'move) + ;; See if we are continuing a previous line + (while t + ;; trap out if we crawl off the top of the buffer + (if (bobp) (throw 'nesting 'cpp)) + + (if (verilog-continued-line-1 lim) + (let ((sp (point))) + (if (and + (not (looking-at verilog-complete-reg)) + (verilog-continued-line-1 lim)) + (progn (goto-char sp) + (throw 'nesting 'cexp)) + + (goto-char sp)) + + (if (and begin + (not verilog-indent-begin-after-if) + (looking-at verilog-no-indent-begin-re)) + (progn + (beginning-of-line) + (skip-chars-forward " \t") + (throw 'nesting 'statement)) + (progn + (throw 'nesting 'cexp)))) + ;; not a continued line + (goto-char starting_position)) + + (if (looking-at "\\") + ;; search back for governing if, striding across begin..end pairs + ;; appropriately + (let ((elsec 1)) + (while (verilog-re-search-backward verilog-ends-re nil 'move) + (cond + ((match-end 1) ; else, we're in deep + (setq elsec (1+ elsec))) + ((match-end 2) ; if + (setq elsec (1- elsec)) + (if (= 0 elsec) + (if verilog-align-ifelse + (throw 'nesting 'statement) + (progn ;; back up to first word on this line + (beginning-of-line) + (verilog-forward-syntactic-ws) + (throw 'nesting 'statement))))) + ((match-end 3) ; assert block + (setq elsec (1- elsec)) + (verilog-beg-of-statement) ;; doesn't get to beginning + (if (looking-at verilog-property-re) + (throw 'nesting 'statement) ; We don't need an endproperty for these + (throw 'nesting 'block) ;We still need a endproperty + )) + (t ; endblock + ; try to leap back to matching outward block by striding across + ; indent level changing tokens then immediately + ; previous line governs indentation. + (let (( reg) (nest 1)) + ;; verilog-ends => else|if|end|join(_any|_none|)|endcase|endclass|endtable|endspecify|endfunction|endtask|endgenerate|endgroup + (cond + ((match-end 4) ; end + ;; Search back for matching begin + (setq reg "\\(\\\\)\\|\\(\\\\)" )) + ((match-end 5) ; endcase + ;; Search back for matching case + (setq reg "\\(\\\\|\\[^:]\\)\\|\\(\\\\)" )) + ((match-end 6) ; endfunction + ;; Search back for matching function + (setq reg "\\(\\\\)\\|\\(\\\\)" )) + ((match-end 7) ; endtask + ;; Search back for matching task + (setq reg "\\(\\\\)\\|\\(\\\\)" )) + ((match-end 8) ; endspecify + ;; Search back for matching specify + (setq reg "\\(\\\\)\\|\\(\\\\)" )) + ((match-end 9) ; endtable + ;; Search back for matching table + (setq reg "\\(\\\\)\\|\\(\\\\)" )) + ((match-end 10) ; endgenerate + ;; Search back for matching generate + (setq reg "\\(\\\\)\\|\\(\\\\)" )) + ((match-end 11) ; joins + ;; Search back for matching fork + (setq reg "\\(\\\\)\\|\\(\\\\)" )) + ((match-end 12) ; class + ;; Search back for matching class + (setq reg "\\(\\\\)\\|\\(\\\\)" )) + ((match-end 13) ; covergroup + ;; Search back for matching covergroup + (setq reg "\\(\\\\)\\|\\(\\\\)" ))) + (catch 'skip + (while (verilog-re-search-backward reg nil 'move) (cond - ((match-end 1) ; else, we're in deep - (setq elsec (1+ elsec))) - ((match-end 2) ; if - (setq elsec (1- elsec)) - (if (= 0 elsec) - (if verilog-align-ifelse - (throw 'nesting 'statement) - (progn ;; back up to first word on this line - (beginning-of-line) - (verilog-forward-syntactic-ws) - (throw 'nesting 'statement))))) - ((match-end 3) ; assert block - (setq elsec (1- elsec)) - (verilog-beg-of-statement) ;; doesn't get to beginning - (if (looking-at verilog-property-re) - (throw 'nesting 'statement) ; We don't need an endproperty for these - (throw 'nesting 'block) ;We still need a endproperty - )) - (t ; endblock - ; try to leap back to matching outward block by striding across - ; indent level changing tokens then immediately - ; previous line governs indentation. - (let (( reg) (nest 1)) -;; verilog-ends => else|if|end|join(_any|_none|)|endcase|endclass|endtable|endspecify|endfunction|endtask|endgenerate|endgroup - (cond - ((match-end 4) ; end - ;; Search back for matching begin - (setq reg "\\(\\\\)\\|\\(\\\\)" )) - ((match-end 5) ; endcase - ;; Search back for matching case - (setq reg "\\(\\\\|\\[^:]\\)\\|\\(\\\\)" )) - ((match-end 6) ; endfunction - ;; Search back for matching function - (setq reg "\\(\\\\)\\|\\(\\\\)" )) - ((match-end 7) ; endtask - ;; Search back for matching task - (setq reg "\\(\\\\)\\|\\(\\\\)" )) - ((match-end 8) ; endspecify - ;; Search back for matching specify - (setq reg "\\(\\\\)\\|\\(\\\\)" )) - ((match-end 9) ; endtable - ;; Search back for matching table - (setq reg "\\(\\\\)\\|\\(\\\\)" )) - ((match-end 10) ; endgenerate - ;; Search back for matching generate - (setq reg "\\(\\\\)\\|\\(\\\\)" )) - ((match-end 11) ; joins - ;; Search back for matching fork - (setq reg "\\(\\\\)\\|\\(\\\\)" )) - ((match-end 12) ; class - ;; Search back for matching class - (setq reg "\\(\\\\)\\|\\(\\\\)" )) - ((match-end 13) ; covergroup - ;; Search back for matching covergroup - (setq reg "\\(\\\\)\\|\\(\\\\)" ))) - (catch 'skip - (while (verilog-re-search-backward reg nil 'move) - (cond - ((match-end 1) ; begin - (setq nest (1- nest)) - (if (= 0 nest) - (throw 'skip 1))) - ((match-end 2) ; end - (setq nest (1+ nest))))) - ))))))) - (throw 'nesting (verilog-calc-1))) - );; catch nesting + ((match-end 1) ; begin + (setq nest (1- nest)) + (if (= 0 nest) + (throw 'skip 1))) + ((match-end 2) ; end + (setq nest (1+ nest))))) + ))))))) + (throw 'nesting (verilog-calc-1))) + );; catch nesting );; type ) ;; Return type of block and indent level. @@ -4883,8 +5338,7 @@ ((match-end 4) ; *sigh* could be "disable fork" (let ((here (point))) (verilog-beg-of-statement) - (if (or (looking-at verilog-disable-fork-re) - (looking-at verilog-fork-wait-re)) + (if (looking-at verilog-disable-fork-re) t ; this is a normal statement (progn ; or is fork, starts a new block (goto-char here) @@ -5050,6 +5504,9 @@ ((looking-at "\\") ;; 11: Search back for matching property (setq reg "\\(\\\\)\\|\\(\\\\)" )) + ((looking-at verilog-uvm-end-re) + ;; 12: Search back for matching sequence + (setq reg (concat "\\(" verilog-uvm-begin-re "\\|" verilog-uvm-end-re "\\)"))) ((looking-at verilog-ovm-end-re) ;; 12: Search back for matching sequence (setq reg (concat "\\(" verilog-ovm-begin-re "\\|" verilog-ovm-end-re "\\)"))) @@ -5177,6 +5634,12 @@ ;;XX ((looking-at "\\<\\(always\\(_latch\\|_ff\\|_comb\\)?\\|case\\(\\|[xz]\\)\\|for\\(\\|each\\|ever\\)\\|i\\(f\\|nitial\\)\\|repeat\\|while\\)\\>") (not (looking-at "\\\\|\\[^:]"))) + ((looking-at verilog-uvm-statement-re) + nil) + ((looking-at verilog-uvm-begin-re) + t) + ((looking-at verilog-uvm-end-re) + t) ((looking-at verilog-ovm-statement-re) nil) ((looking-at verilog-ovm-begin-re) @@ -5241,9 +5704,24 @@ t)))))))) (defun verilog-backward-syntactic-ws () + "Move backwards putting point after first non-whitespace non-comment." (verilog-skip-backward-comments) (forward-comment (- (buffer-size)))) +(defun verilog-backward-syntactic-ws-quick () + "As with `verilog-backward-syntactic-ws' but uses `verilog-scan' cache." + (while (cond ((bobp) + nil) ; Done + ((> (skip-syntax-backward " ") 0) + t) + ((eq (preceding-char) ?\n) ;; \n's terminate // so aren't space syntax + (forward-char -1) + t) + ((or (verilog-inside-comment-or-string-p (1- (point))) + (verilog-inside-comment-or-string-p (point))) + (re-search-backward "[/\"]" nil t) ;; Only way a comment or quote can begin + t)))) + (defun verilog-forward-syntactic-ws () (verilog-skip-forward-comment-p) (forward-comment (buffer-size))) @@ -5339,9 +5817,17 @@ (defun verilog-in-attribute-p () "Return true if point is in an attribute (* [] attribute *)." - (save-excursion - (verilog-re-search-backward "\\((\\*\\)\\|\\(\\*)\\)" nil 'move) - (numberp (match-beginning 1)))) + (save-match-data + (save-excursion + (verilog-re-search-backward "\\((\\*\\)\\|\\(\\*)\\)" nil 'move) + (numberp (match-beginning 1))))) + +(defun verilog-in-parameter-p () + "Return true if point is in a parameter assignment #( p1=1, p2=5)." + (save-match-data + (save-excursion + (verilog-re-search-backward "\\(#(\\)\\|\\()\\)" nil 'move) + (numberp (match-beginning 1))))) (defun verilog-in-escaped-name-p () "Return true if in an escaped name." @@ -5357,11 +5843,27 @@ (beginning-of-line) (looking-at verilog-directive-re-1))) +(defun verilog-in-parenthesis-p () + "Return true if in a ( ) expression (but not { } or [ ])." + (save-match-data + (save-excursion + (verilog-re-search-backward "\\((\\)\\|\\()\\)" nil 'move) + (numberp (match-beginning 1))))) + (defun verilog-in-paren () - "Return true if in a parenthetical expression." + "Return true if in a parenthetical expression. +May cache result using `verilog-syntax-ppss'." (let ((state (save-excursion (verilog-syntax-ppss)))) (> (nth 0 state) 0 ))) +(defun verilog-in-paren-quick () + "Return true if in a parenthetical expression. +Always starts from point-min, to allow inserts with hooks disabled." + ;; The -quick refers to its use alongside the other -quick functions, + ;; not that it's likely to be faster than verilog-in-paren. + (let ((state (save-excursion (parse-partial-sexp (point-min) (point))))) + (> (nth 0 state) 0 ))) + (defun verilog-in-struct-p () "Return true if in a struct declaration." (interactive) @@ -5607,7 +6109,11 @@ (goto-char fst) (+ (current-column) verilog-cexp-indent)))))) (goto-char here) - (indent-line-to val))) + (indent-line-to val) + (if (and (not verilog-indent-lists) + (verilog-in-paren)) + (verilog-pretty-declarations)) + )) ((= (preceding-char) ?\) ) (goto-char here) (let ((val (eval (cdr (assoc type verilog-indent-alist))))) @@ -5915,102 +6421,104 @@ (unless quiet (message ""))))))) (defun verilog-pretty-expr (&optional quiet myre) - "Line up expressions around point, optionally QUIET with regexp MYRE." - (interactive "i\nsRegular Expression: ((<|:)?=) ") - (save-excursion - (if (or (eq myre nil) - (string-equal myre "")) - (setq myre "\\(<\\|:\\)?=")) - ;; want to match the first <= | := | = - (setq myre (concat "\\(^.*?\\)\\(" myre "\\)")) - (let ((rexp(concat "^\\s-*" verilog-complete-reg))) - (beginning-of-line) - (if (and (not (looking-at rexp )) - (looking-at myre) - (save-excursion - (goto-char (match-beginning 2)) - (not (verilog-in-comment-or-string-p)))) - (let* ((here (point)) - (e) (r) - (start - (progn - (beginning-of-line) - (setq e (point)) - (verilog-backward-syntactic-ws) - (beginning-of-line) - (while (and (not (looking-at rexp )) - (looking-at myre) - (not (bobp)) - ) - (setq e (point)) - (verilog-backward-syntactic-ws) - (beginning-of-line) - ) ;Ack, need to grok `define - e)) - (end - (progn - (goto-char here) - (end-of-line) - (setq e (point)) ;Might be on last line - (verilog-forward-syntactic-ws) - (beginning-of-line) - (while (and - (not (looking-at rexp )) - (looking-at myre) - (progn - (end-of-line) - (not (eq e (point))))) - (setq e (point)) - (verilog-forward-syntactic-ws) - (beginning-of-line) - ) - e)) - (endpos (set-marker (make-marker) end)) - (ind) - ) - (goto-char start) - (verilog-do-indent (verilog-calculate-indent)) - (if (and (not quiet) - (> (- end start) 100)) - (message "Lining up expressions..(please stand by)")) - - ;; Set indent to minimum throughout region - (while (< (point) (marker-position endpos)) - (beginning-of-line) - (verilog-just-one-space myre) - (end-of-line) - (verilog-forward-syntactic-ws) - ) - - ;; Now find biggest prefix - (setq ind (verilog-get-lineup-indent-2 myre start endpos)) - - ;; Now indent each line. - (goto-char start) - (while (progn (setq e (marker-position endpos)) - (setq r (- e (point))) - (> r 0)) - (setq e (point)) - (if (not quiet) (message "%d" r)) - (cond - ((looking-at myre) - (goto-char (match-beginning 2)) - (if (not (verilog-parenthesis-depth)) ;; ignore parenthesized exprs - (if (eq (char-after) ?=) - (indent-to (1+ ind)) ; line up the = of the <= with surrounding = - (indent-to ind) - ))) - ((verilog-continued-line-1 start) - (goto-char e) - (indent-line-to ind)) - (t ; Must be comment or white space - (goto-char e) - (verilog-forward-ws&directives) - (forward-line -1)) - ) - (forward-line 1)) - (unless quiet (message "")) - ))))) + "Line up expressions around point, optionally QUIET with regexp MYRE ignored." + (interactive) + (if (not (verilog-in-comment-or-string-p)) + (save-excursion + (let ((rexp (concat "^\\s-*" verilog-complete-reg))) + (beginning-of-line) + (if (and (not (looking-at rexp )) + (looking-at verilog-assignment-operation-re) + (save-excursion + (goto-char (match-end 2)) + (and (not (verilog-in-attribute-p)) + (not (verilog-in-parameter-p)) + (not (verilog-in-comment-or-string-p))))) + (let* ((here (point)) + (e) (r) + (start + (progn + (beginning-of-line) + (setq e (point)) + (verilog-backward-syntactic-ws) + (beginning-of-line) + (while (and (not (looking-at rexp )) + (looking-at verilog-assignment-operation-re) + (not (bobp)) + ) + (setq e (point)) + (verilog-backward-syntactic-ws) + (beginning-of-line) + ) ;Ack, need to grok `define + e)) + (end + (progn + (goto-char here) + (end-of-line) + (setq e (point)) ;Might be on last line + (verilog-forward-syntactic-ws) + (beginning-of-line) + (while (and + (not (looking-at rexp )) + (looking-at verilog-assignment-operation-re) + (progn + (end-of-line) + (not (eq e (point))))) + (setq e (point)) + (verilog-forward-syntactic-ws) + (beginning-of-line) + ) + e)) + (endpos (set-marker (make-marker) end)) + (ind) + ) + (goto-char start) + (verilog-do-indent (verilog-calculate-indent)) + (if (and (not quiet) + (> (- end start) 100)) + (message "Lining up expressions..(please stand by)")) + + ;; Set indent to minimum throughout region + (while (< (point) (marker-position endpos)) + (beginning-of-line) + (verilog-just-one-space verilog-assignment-operation-re) + (beginning-of-line) + (verilog-do-indent (verilog-calculate-indent)) + (end-of-line) + (verilog-forward-syntactic-ws) + ) + + ;; Now find biggest prefix + (setq ind (verilog-get-lineup-indent-2 verilog-assignment-operation-re start endpos)) + + ;; Now indent each line. + (goto-char start) + (while (progn (setq e (marker-position endpos)) + (setq r (- e (point))) + (> r 0)) + (setq e (point)) + (if (not quiet) (message "%d" r)) + (cond + ((looking-at verilog-assignment-operation-re) + (goto-char (match-beginning 2)) + (if (not (or (verilog-in-parenthesis-p) ;; leave attributes and comparisons alone + (verilog-in-coverage-p))) + (if (eq (char-after) ?=) + (indent-to (1+ ind)) ; line up the = of the <= with surrounding = + (indent-to ind) + )) + ) + ((verilog-continued-line-1 start) + (goto-char e) + (indent-line-to ind)) + (t ; Must be comment or white space + (goto-char e) + (verilog-forward-ws&directives) + (forward-line -1)) + ) + (forward-line 1)) + (unless quiet (message "")) + )))))) (defun verilog-just-one-space (myre) "Remove extra spaces around regular expression MYRE." @@ -6021,11 +6529,9 @@ (p2 (match-end 2))) (progn (goto-char p2) - (if (looking-at "\\s-") (just-one-space)) + (just-one-space) (goto-char p1) - (forward-char -1) - (if (looking-at "\\s-") (just-one-space)) - )))) + (just-one-space))))) (defun verilog-indent-declaration (baseind) "Indent current lines as declaration. @@ -6128,7 +6634,7 @@ (while (progn (setq e (marker-position edpos)) (< (point) e)) (if (and (verilog-re-search-forward myre e 'move) - (not (verilog-parenthesis-depth))) ;; skip parenthesized exprs + (not (verilog-in-attribute-p))) ;; skip attribute exprs (progn (goto-char (match-beginning 2)) (verilog-backward-syntactic-ws) @@ -6374,10 +6880,10 @@ (defun verilog-keyword-completion (keyword-list) "Give list of all possible completions of keywords in KEYWORD-LIST." (mapcar (lambda (s) - (if (string-match (concat "\\<" verilog-str) s) - (if (or (null verilog-pred) - (funcall verilog-pred s)) - (setq verilog-all (cons s verilog-all))))) + (if (string-match (concat "\\<" verilog-str) s) + (if (or (null verilog-pred) + (funcall verilog-pred s)) + (setq verilog-all (cons s verilog-all))))) keyword-list)) @@ -6883,16 +7389,18 @@ (defsubst verilog-sig-width (sig) (verilog-make-width-expression (verilog-sig-bits sig))) -(defsubst verilog-alw-new (outputs temps inputs delayed) - (list outputs temps inputs delayed)) -(defsubst verilog-alw-get-outputs (sigs) +(defsubst verilog-alw-new (outputs-del outputs-imm temps inputs) + (list outputs-del outputs-imm temps inputs)) +(defsubst verilog-alw-get-outputs-delayed (sigs) (nth 0 sigs)) +(defsubst verilog-alw-get-outputs-immediate (sigs) + (nth 1 sigs)) (defsubst verilog-alw-get-temps (sigs) - (nth 1 sigs)) + (nth 2 sigs)) (defsubst verilog-alw-get-inputs (sigs) - (nth 2 sigs)) + (nth 3 sigs)) (defsubst verilog-alw-get-uses-delayed (sigs) - (nth 3 sigs)) + (nth 0 sigs)) (defsubst verilog-modi-new (name fob pt type) (vector name fob pt type)) @@ -6911,18 +7419,18 @@ ;; Signal reading for given module ;; Note these all take modi's - as returned from verilog-modi-current -(defsubst verilog-decls-new (out inout in wires regs assigns consts gparams interfaces) - (vector out inout in wires regs assigns consts gparams interfaces)) +(defsubst verilog-decls-new (out inout in vars unuseds assigns consts gparams interfaces) + (vector out inout in vars unuseds assigns consts gparams interfaces)) (defsubst verilog-decls-get-outputs (decls) (aref decls 0)) (defsubst verilog-decls-get-inouts (decls) (aref decls 1)) (defsubst verilog-decls-get-inputs (decls) (aref decls 2)) -(defsubst verilog-decls-get-wires (decls) +(defsubst verilog-decls-get-vars (decls) (aref decls 3)) -(defsubst verilog-decls-get-regs (decls) - (aref decls 4)) +;;(defsubst verilog-decls-get-unused (decls) +;; (aref decls 4)) (defsubst verilog-decls-get-assigns (decls) (aref decls 5)) (defsubst verilog-decls-get-consts (decls) @@ -7026,6 +7534,7 @@ buswarn "")) ;; Extract bus details (setq bus (verilog-sig-bits sig)) + (setq bus (and bus (verilog-simplify-range-expression bus))) (cond ((and bus (or (and (string-match "\\[\\([0-9]+\\):\\([0-9]+\\)\\]" bus) (setq highbit (string-to-number (match-string 1 bus)) @@ -7145,9 +7654,10 @@ "Return module name when after its ( or ;." (save-excursion (re-search-backward "[(;]") - (verilog-re-search-backward-quick "\\b[a-zA-Z0-9`_\$]" nil nil) - (skip-chars-backward "a-zA-Z0-9`_$") - (looking-at "[a-zA-Z0-9`_\$]+") + ;; Due to "module x import y (" we must search for declaration begin + (verilog-re-search-backward-quick verilog-defun-re nil nil) + (goto-char (match-end 0)) + (verilog-re-search-forward-quick "\\b[a-zA-Z0-9`_\$]+" nil nil) ;; Important: don't use match string, this must work with Emacs 19 font-lock on (verilog-symbol-detick (buffer-substring-no-properties (match-beginning 0) (match-end 0)) t))) @@ -7203,13 +7713,13 @@ Return a array of [outputs inouts inputs wire reg assign const]." (let ((end-mod-point (or (verilog-get-end-of-defun t) (point-max))) (functask 0) (paren 0) (sig-paren 0) (v2kargs-ok t) - in-modport - sigs-in sigs-out sigs-inout sigs-wire sigs-reg sigs-assign sigs-const + in-modport ign-prop + sigs-in sigs-out sigs-inout sigs-var sigs-assign sigs-const sigs-gparam sigs-intf vec expect-signal keywd newsig rvalue enum io signed typedefed multidim modport) (save-excursion - (verilog-beg-of-defun) + (verilog-beg-of-defun-quick) (setq sigs-const (verilog-read-auto-constants (point) end-mod-point)) (while (< (point) end-mod-point) ;;(if dbg (setq dbg (concat dbg (format "Pt %s Vec %s C%c Kwd'%s'\n" (point) vec (following-char) keywd)))) @@ -7225,16 +7735,16 @@ (or (search-forward "*/") (error "%s: Unmatched /* */, at char %d" (verilog-point-text) (point)))) ((looking-at "(\\*") - (forward-char 2) - (or (looking-at "\\s-*)") ; It's an "always @ (*)" - (search-forward "*)") + ;; To advance past either "(*)" or "(* ... *)" don't forward past first * + (forward-char 1) + (or (search-forward "*)") (error "%s: Unmatched (* *), at char %d" (verilog-point-text) (point)))) ((eq ?\" (following-char)) (or (re-search-forward "[^\\]\"" nil t) ;; don't forward-char first, since we look for a non backslash first (error "%s: Unmatched quotes, at char %d" (verilog-point-text) (point)))) ((eq ?\; (following-char)) (setq vec nil io nil expect-signal nil newsig nil paren 0 rvalue nil - v2kargs-ok nil in-modport nil) + v2kargs-ok nil in-modport nil ign-prop nil) (forward-char 1)) ((eq ?= (following-char)) (setq rvalue t newsig nil) @@ -7290,16 +7800,15 @@ ((equal keywd "parameter") (setq vec nil enum nil rvalue nil signed nil typedefed nil multidim nil sig-paren paren expect-signal 'sigs-gparam io t modport nil)) - ((member keywd '("wire" "tri" "tri0" "tri1" "triand" "trior" "wand" "wor")) - (unless io (setq vec nil enum nil rvalue nil signed nil typedefed nil multidim nil sig-paren paren - expect-signal 'sigs-wire modport nil))) - ((member keywd '("reg" "trireg" + ((member keywd '("wire" + "tri" "tri0" "tri1" "triand" "trior" "wand" "wor" + "reg" "trireg" "byte" "shortint" "int" "longint" "integer" "time" "bit" "logic" "shortreal" "real" "realtime" "string" "event" "chandle")) (unless io (setq vec nil enum nil rvalue nil signed nil typedefed nil multidim nil sig-paren paren - expect-signal 'sigs-reg modport nil))) + expect-signal 'sigs-var modport nil))) ((equal keywd "assign") (setq vec nil enum nil rvalue nil signed nil typedefed nil multidim nil sig-paren paren expect-signal 'sigs-assign modport nil)) @@ -7307,11 +7816,14 @@ "localparam" "genvar")) (unless io (setq vec nil enum nil rvalue nil signed nil typedefed nil multidim nil sig-paren paren expect-signal 'sigs-const modport nil))) - ((equal keywd "signed") - (setq signed "signed")) + ((member keywd '("signed" "unsigned")) + (setq signed keywd)) + ((member keywd '("assert" "assume" "cover" "expect" "restrict")) + (setq ign-prop t)) ((member keywd '("class" "clocking" "covergroup" "function" "property" "randsequence" "sequence" "task")) - (setq functask (1+ functask))) + (unless ign-prop + (setq functask (1+ functask)))) ((member keywd '("endclass" "endclocking" "endgroup" "endfunction" "endproperty" "endsequence" "endtask")) (setq functask (1- functask))) @@ -7354,8 +7866,8 @@ (verilog-decls-new (nreverse sigs-out) (nreverse sigs-inout) (nreverse sigs-in) - (nreverse sigs-wire) - (nreverse sigs-reg) + (nreverse sigs-var) + nil (nreverse sigs-assign) (nreverse sigs-const) (nreverse sigs-gparam) @@ -7442,8 +7954,7 @@ multidim nil) sigs-intf))) ((setq portdata (and verilog-read-sub-decls-in-interfaced - (or (assoc port (verilog-decls-get-regs submoddecls)) - (assoc port (verilog-decls-get-wires submoddecls))))) + (assoc port (verilog-decls-get-vars submoddecls)))) (setq sigs-intfd (cons (verilog-sig-new sig @@ -7556,7 +8067,8 @@ submoddecls comment port (buffer-substring (point) (1- (progn (search-backward "(") ; start at ( - (forward-sexp 1) (point)))))))) ; expr + (verilog-forward-sexp-ign-cmt 1) + (point)))))))) ; expr ;; (forward-line 1))))) @@ -7573,8 +8085,9 @@ (or (search-forward "*/") (error "%s: Unmatched /* */, at char %d" (verilog-point-text) (point)))) ((looking-at "(\\*") - (or (looking-at "(\\*\\s-*)") ; It's a "always @ (*)" - (search-forward "*)") + ;; To advance past either "(*)" or "(* ... *)" don't forward past first * + (forward-char 1) + (or (search-forward "*)") (error "%s: Unmatched (* *), at char %d" (verilog-point-text) (point)))) ;; On pins, parse and advance to next pin ;; Looking at pin, but *not* an // Output comment, or ) to end the inst @@ -7612,11 +8125,11 @@ st-point end-inst-point ;; below 3 modified by verilog-read-sub-decls-line sigs-out sigs-inout sigs-in sigs-intf sigs-intfd) - (verilog-beg-of-defun) - (while (verilog-re-search-forward "\\(/\\*AUTOINST\\*/\\|\\.\\*\\)" end-mod-point t) + (verilog-beg-of-defun-quick) + (while (verilog-re-search-forward-quick "\\(/\\*AUTOINST\\*/\\|\\.\\*\\)" end-mod-point t) (save-excursion (goto-char (match-beginning 0)) - (unless (verilog-inside-comment-p) + (unless (verilog-inside-comment-or-string-p) ;; Attempt to snarf a comment (let* ((submod (verilog-read-inst-module)) (inst (verilog-read-inst-name)) @@ -7629,7 +8142,8 @@ submoddecls (verilog-decls-new nil nil nil nil nil nil nil nil nil) comment (concat inst " of " submod)) (verilog-backward-open-paren) - (setq end-inst-point (save-excursion (forward-sexp 1) (point)) + (setq end-inst-point (save-excursion (verilog-forward-sexp-ign-cmt 1) + (point)) st-point (point)) (forward-char 1) (verilog-read-sub-decls-gate submoddecls comment submod end-inst-point)) @@ -7639,7 +8153,8 @@ (setq submoddecls (verilog-modi-get-decls submodi) verilog-read-sub-decls-gate-ios nil) (verilog-backward-open-paren) - (setq end-inst-point (save-excursion (forward-sexp 1) (point)) + (setq end-inst-point (save-excursion (verilog-forward-sexp-ign-cmt 1) + (point)) st-point (point)) ;; This could have used a list created by verilog-auto-inst ;; However I want it to be runnable even on user's manually added signals @@ -7677,10 +8192,10 @@ (verilog-backward-open-paren) (while (re-search-forward "\\.\\([^(,) \t\n\f]*\\)\\s-*" end-mod-point t) (setq pin (match-string 1)) - (unless (verilog-inside-comment-p) + (unless (verilog-inside-comment-or-string-p) (setq pins (cons (list pin) pins)) (when (looking-at "(") - (forward-sexp 1)))) + (verilog-forward-sexp-ign-cmt 1)))) (vector pins)))) (defun verilog-read-arg-pins () @@ -7691,7 +8206,7 @@ (verilog-backward-open-paren) (while (re-search-forward "\\([a-zA-Z0-9$_.%`]+\\)" end-mod-point t) (setq pin (match-string 1)) - (unless (verilog-inside-comment-p) + (unless (verilog-inside-comment-or-string-p) (setq pins (cons (list pin) pins)))) (vector pins)))) @@ -7707,7 +8222,7 @@ (search-forward "(" end-mod-point) (setq tpl-end-pt (save-excursion (backward-char 1) - (forward-sexp 1) ;; Moves to paren that closes argdecl's + (verilog-forward-sexp-cmt 1) ;; Moves to paren that closes argdecl's (backward-char 1) (point))) (while (re-search-forward "\\s-*\\([\"a-zA-Z0-9$_.%`]+\\)\\s-*,*" tpl-end-pt t) @@ -7720,6 +8235,7 @@ (defun verilog-read-auto-lisp-present () "Set `verilog-cache-has-lisp' if any AUTO_LISP in this buffer." (save-excursion + (goto-char (point-min)) (setq verilog-cache-has-lisp (re-search-forward "\\" nil t) + (verilog-re-search-forward-quick "\\<\\(module\\|interface\\|program\\)\\>" nil t) (setq type (match-string-no-properties 0)) (verilog-re-search-forward-quick "[(;]" nil t)) (if (equal module (verilog-read-module-name)) @@ -8804,13 +9337,12 @@ ;; Combined (defun verilog-decls-get-signals (decls) + "Return all declared signals, excluding 'assign' statements." (append (verilog-decls-get-outputs decls) (verilog-decls-get-inouts decls) (verilog-decls-get-inputs decls) - (verilog-decls-get-wires decls) - (verilog-decls-get-regs decls) - (verilog-decls-get-assigns decls) + (verilog-decls-get-vars decls) (verilog-decls-get-consts decls) (verilog-decls-get-gparams decls))) @@ -8826,10 +9358,8 @@ (verilog-modi-cache-add modi 'verilog-read-decls 1 sig-list)) (defsubst verilog-modi-cache-add-inputs (modi sig-list) (verilog-modi-cache-add modi 'verilog-read-decls 2 sig-list)) -(defsubst verilog-modi-cache-add-wires (modi sig-list) +(defsubst verilog-modi-cache-add-vars (modi sig-list) (verilog-modi-cache-add modi 'verilog-read-decls 3 sig-list)) -(defsubst verilog-modi-cache-add-regs (modi sig-list) - (verilog-modi-cache-add modi 'verilog-read-decls 4 sig-list)) (defun verilog-signals-from-signame (signame-list) "Return signals in standard form from SIGNAME-LIST, a simple list of signal names." @@ -8843,7 +9373,7 @@ (defun verilog-auto-re-search-do (search-for func) "Search for the given auto text regexp SEARCH-FOR, and perform FUNC where it occurs." (goto-char (point-min)) - (while (verilog-re-search-forward search-for nil t) + (while (verilog-re-search-forward-quick search-for nil t) (funcall func))) (defun verilog-insert-one-definition (sig type indent-pt) @@ -8867,10 +9397,31 @@ (when (verilog-sig-memory sig) (insert " " (verilog-sig-memory sig)))) -(defun verilog-insert-definition (sigs direction indent-pt v2k &optional dont-sort) - "Print out a definition for a list of SIGS of the given DIRECTION, +(defun verilog-insert-definition (modi sigs direction indent-pt v2k &optional dont-sort) + "Print out a definition for MODI's list of SIGS of the given DIRECTION, with appropriate INDENT-PT indentation. If V2K, use Verilog 2001 I/O -format. Sort unless DONT-SORT. DIRECTION is normally wire/reg/output." +format. Sort unless DONT-SORT. DIRECTION is normally wire/reg/output. +When MODI is non-null, also add to modi-cache, for tracking." + (when modi + (cond ((equal direction "wire") + (verilog-modi-cache-add-vars modi sigs)) + ((equal direction "reg") + (verilog-modi-cache-add-vars modi sigs)) + ((equal direction "output") + (verilog-modi-cache-add-outputs modi sigs) + (when verilog-auto-declare-nettype + (verilog-modi-cache-add-vars modi sigs))) + ((equal direction "input") + (verilog-modi-cache-add-inputs modi sigs) + (when verilog-auto-declare-nettype + (verilog-modi-cache-add-vars modi sigs))) + ((equal direction "inout") + (verilog-modi-cache-add-inouts modi sigs) + (when verilog-auto-declare-nettype + (verilog-modi-cache-add-vars modi sigs))) + ((equal direction "interface")) + (t + (error "Unsupported verilog-insert-definition direction: %s" direction)))) (or dont-sort (setq sigs (sort (copy-alist sigs) `verilog-signals-sort-compare))) (while sigs @@ -8878,12 +9429,18 @@ (verilog-insert-one-definition sig ;; Want "type x" or "output type x", not "wire type x" - (cond ((verilog-sig-type sig) + (cond ((or (verilog-sig-type sig) + verilog-auto-wire-type) (concat - (if (not (member direction '("wire" "interface"))) - (concat direction " ")) - (verilog-sig-type sig))) - (t direction)) + (when (member direction '("input" "output" "inout")) + (concat direction " ")) + (or (verilog-sig-type sig) + verilog-auto-wire-type))) + ((and verilog-auto-declare-nettype + (member direction '("input" "output" "inout"))) + (concat direction " " verilog-auto-declare-nettype)) + (t + direction)) indent-pt) (insert (if v2k "," ";")) (if (or (not (verilog-sig-comment sig)) @@ -8914,7 +9471,7 @@ ;; We can't just search backward for ) as it might be inside another expression. ;; Also want "`ifdef X input foo `endif" to just leave things to the human to deal with (save-excursion - (verilog-backward-syntactic-ws) + (verilog-backward-syntactic-ws-quick) (when (and (not (save-excursion ;; Not beginning (, or existing , (backward-char 1) (looking-at "[(,]"))) @@ -8931,7 +9488,7 @@ (save-excursion (verilog-forward-close-paren) (backward-char 1) - (verilog-backward-syntactic-ws) + (verilog-backward-syntactic-ws-quick) (backward-char 1) (when (looking-at ",") (delete-char 1)))) @@ -8978,27 +9535,68 @@ (t nil))))) ;;(verilog-make-width-expression "`A:`B") -(defun verilog-simplify-range-expression (range-exp) - "Return a simplified range expression with constants eliminated from RANGE-EXP." - (let ((out range-exp) - (last-pass "")) - (while (not (equal last-pass out)) - (setq last-pass out) - (while (string-match "(\\<\\([0-9A-Z-az_]+\\)\\>)" out) - (setq out (replace-match "\\1" nil nil out))) - (while (string-match "\\<\\([0-9]+\\)\\>\\s *\\+\\s *\\<\\([0-9]+\\)\\>" out) - (setq out (replace-match - (int-to-string (+ (string-to-number (match-string 1 out)) - (string-to-number (match-string 2 out)))) - nil nil out))) - (while (string-match "\\<\\([0-9]+\\)\\>\\s *\\-\\s *\\<\\([0-9]+\\)\\>" out) - (setq out (replace-match - (int-to-string (- (string-to-number (match-string 1 out)) - (string-to-number (match-string 2 out)))) - nil nil out)))) - out)) -;;(verilog-simplify-range-expression "1") -;;(verilog-simplify-range-expression "(((16)+1)-3)") +(defun verilog-simplify-range-expression (expr) + "Return a simplified range expression with constants eliminated from EXPR." + ;; Note this is always called with brackets; ie [z] or [z:z] + (if (not (string-match "[---+*()]" expr)) + expr ;; short-circuit + (let ((out expr) + (last-pass "")) + (while (not (equal last-pass out)) + (setq last-pass out) + ;; Prefix regexp needs beginning of match, or some symbol of + ;; lesser or equal precedence. We assume the [:]'s exist in expr. + ;; Ditto the end. + (while (string-match + (concat "\\([[({:*+-]\\)" ; - must be last + "(\\<\\([0-9A-Za-z_]+\\))" + "\\([])}:*+-]\\)") + out) + (setq out (replace-match "\\1\\2\\3" nil nil out))) + ;; For precedence do * before +/- + (while (string-match + (concat "\\([[({:*+-]\\)" + "\\([0-9]+\\)\\s *\\([*]\\)\\s *\\([0-9]+\\)" + "\\([])}:*+-]\\)") + out) + (setq out (replace-match + (concat (match-string 1 out) + (int-to-string (* (string-to-number (match-string 2 out)) + (string-to-number (match-string 4 out)))) + (match-string 5 out)) + nil nil out))) + (while (string-match + (concat "\\([[({:+-]\\)" ; No * here as higher prec + "\\([0-9]+\\)\\s *\\([---+]\\)\\s *\\([0-9]+\\)" + "\\([])}:+-]\\)") + out) + (let ((pre (match-string 1 out)) + (lhs (string-to-number (match-string 2 out))) + (rhs (string-to-number (match-string 4 out))) + (post (match-string 5 out)) + val) + (when (equal pre "-") + (setq lhs (- lhs))) + (setq val (if (equal (match-string 3 out) "-") + (- lhs rhs) + (+ lhs rhs)) + out (replace-match + (concat (if (and (equal pre "-") + (< val 0)) + "" ;; Not "--20" but just "-20" + pre) + (int-to-string val) + post) + nil nil out)) ))) + out))) +;;(verilog-simplify-range-expression "[1:3]") ;; 1 +;;(verilog-simplify-range-expression "[(1):3]") ;; 1 +;;(verilog-simplify-range-expression "[(((16)+1)+1+(1+1))]") ;;20 +;;(verilog-simplify-range-expression "[(2*3+6*7)]") ;; 48 +;;(verilog-simplify-range-expression "[(FOO*4-1*2)]") ;; FOO*4-2 +;;(verilog-simplify-range-expression "[(FOO*4+1-1)]") ;; FOO*4+0 +;;(verilog-simplify-range-expression "[(func(BAR))]") ;; func(BAR) +;;(verilog-simplify-range-expression "[FOO-1+1-1+1]") ;; FOO-0 (defun verilog-typedef-name-p (variable-name) "Return true if the VARIABLE-NAME is a type definition." @@ -9011,15 +9609,17 @@ (defun verilog-delete-autos-lined () "Delete autos that occupy multiple lines, between begin and end comments." + ;; The newline must not have a comment property, so we must + ;; delete the end auto's newline, not the first newline + (forward-line 1) (let ((pt (point))) - (forward-line 1) (when (and (looking-at "\\s-*// Beginning") (search-forward "// End of automatic" nil t)) ;; End exists (end-of-line) - (delete-region pt (point)) - (forward-line 1)))) + (forward-line 1) + (delete-region pt (point))))) (defun verilog-delete-empty-auto-pair () "Delete begin/end auto pair at point, if empty." @@ -9066,11 +9666,11 @@ (defun verilog-delete-to-paren () "Delete the automatic inst/sense/arg created by autos. -Deletion stops at the matching end parenthesis." +Deletion stops at the matching end parenthesis, outside comments." (delete-region (point) (save-excursion (verilog-backward-open-paren) - (forward-sexp 1) ;; Moves to paren that closes argdecl's + (verilog-forward-sexp-ign-cmt 1) ;; Moves to paren that closes argdecl's (backward-char 1) (point)))) @@ -9078,7 +9678,8 @@ "Return if a .* AUTOINST is safe to delete or expand. It was created by the AUTOS themselves, or by the user." (and verilog-auto-star-expand - (looking-at "[ \t\n\f,]*\\([)]\\|// \\(Outputs\\|Inouts\\|Inputs\\|Interfaces\\)\\)"))) + (looking-at + (concat "[ \t\n\f,]*\\([)]\\|// " verilog-inst-comment-re "\\)")))) (defun verilog-delete-auto-star-all () "Delete a .* AUTOINST, if it is safe." @@ -9110,7 +9711,7 @@ (save-excursion (while (progn (forward-line -1) - (looking-at "\\s *//\\s *\\(Outputs\\|Inouts\\|Inputs\\|Interfaces\\)\n")) + (looking-at (concat "\\s *//\\s *" verilog-inst-comment-re "\n"))) (delete-region (match-beginning 0) (match-end 0)))) ;; If it is simple, we can put the ); on the same line as the last text (let ((rtn-pt (point))) @@ -9139,18 +9740,13 @@ (verilog-save-no-change-functions (verilog-save-scan-cache ;; Allow user to customize - (run-hooks 'verilog-before-delete-auto-hook) + (verilog-run-hooks 'verilog-before-delete-auto-hook) ;; Remove those that have multi-line insertions, possibly with parameters + ;; We allow anything beginning with AUTO, so that users can add their own + ;; patterns (verilog-auto-re-search-do - (concat "/\\*" - (eval-when-compile - (verilog-regexp-words - `("AUTOASCIIENUM" "AUTOCONCATCOMMENT" "AUTODEFINEVALUE" - "AUTOINOUT" "AUTOINOUTCOMP" "AUTOINOUTMODULE" - "AUTOINPUT" "AUTOINSERTLISP" "AUTOOUTPUT" "AUTOOUTPUTEVERY" - "AUTOREG" "AUTOREGINPUT" "AUTORESET" "AUTOTIEOFF" - "AUTOUNUSED" "AUTOWIRE"))) + (concat "/\\*AUTO[A-Za-z0-9_]+" ;; Optional parens or quoted parameter or .* for (((...))) "\\(\\|([^)]*)\\|(\"[^\"]*\")\\).*?" "\\*/") @@ -9169,11 +9765,11 @@ 'verilog-delete-auto-star-all) ;; Remove template comments ... anywhere in case was pasted after AUTOINST removed (goto-char (point-min)) - (while (re-search-forward "\\s-*// \\(Templated\\|Implicit \\.\\*\\)[ \tLT0-9]*$" nil t) + (while (re-search-forward "\\s-*// \\(Templated\\|Implicit \\.\\*\\)\\([ \tLT0-9]*\\| LHS: .*\\)?$" nil t) (replace-match "")) ;; Final customize - (run-hooks 'verilog-delete-auto-hook))))) + (verilog-run-hooks 'verilog-delete-auto-hook))))) ;; ;; Auto inject @@ -9235,7 +9831,7 @@ (when (not (re-search-forward "/\\*AUTOARG\\*/" endmodp t)) (verilog-re-search-forward-quick ";" nil t) (backward-char 1) - (verilog-backward-syntactic-ws) + (verilog-backward-syntactic-ws-quick) (backward-char 1) ; Moves to paren that closes argdecl's (when (looking-at ")") (verilog-insert "/*AUTOARG*/"))))))) @@ -9251,9 +9847,9 @@ pre-sigs got-sigs) (backward-char 1) - (forward-sexp 1) + (verilog-forward-sexp-ign-cmt 1) (backward-char 1) ;; End ) - (when (not (verilog-re-search-backward "/\\*\\(AUTOSENSE\\|AS\\)\\*/" start-pt t)) + (when (not (verilog-re-search-backward-quick "/\\*\\(AUTOSENSE\\|AS\\)\\*/" start-pt t)) (setq pre-sigs (verilog-signals-from-signame (verilog-read-signals start-pt (point))) got-sigs (verilog-auto-sense-sigs moddecls nil)) @@ -9277,12 +9873,12 @@ (forward-char 1) (let ((indent-pt (+ (current-column))) (end-pt (save-excursion (verilog-forward-close-paren) (point)))) - (cond ((verilog-re-search-forward "\\(/\\*AUTOINST\\*/\\|\\.\\*\\)" end-pt t) + (cond ((verilog-re-search-forward-quick "\\(/\\*AUTOINST\\*/\\|\\.\\*\\)" end-pt t) (goto-char end-pt)) ;; Already there, continue search with next instance (t ;; Delete identical interconnect (let ((case-fold-search nil)) ;; So we don't convert upper-to-lower, etc - (while (verilog-re-search-forward "\\.\\s *\\([a-zA-Z0-9`_\$]+\\)*\\s *(\\s *\\1\\s *)\\s *" end-pt t) + (while (verilog-re-search-forward-quick "\\.\\s *\\([a-zA-Z0-9`_\$]+\\)*\\s *(\\s *\\1\\s *)\\s *" end-pt t) (delete-region (match-beginning 0) (match-end 0)) (setq end-pt (- end-pt (- (match-end 0) (match-beginning 0)))) ;; Keep it correct (while (or (looking-at "[ \t\n\f,]+") @@ -9298,6 +9894,131 @@ (verilog-insert-indent "/*AUTOINST*/"))))))))) ;; +;; Auto diff +;; + +(defun verilog-diff-buffers-p (b1 b2 &optional whitespace) + "Return nil if buffers B1 and B2 have same contents. +Else, return point in B1 that first mismatches. +If optional WHITESPACE true, ignore whitespace." + (save-excursion + (let* ((case-fold-search nil) ;; compare-buffer-substrings cares + (p1 (with-current-buffer b1 (goto-char (point-min)))) + (p2 (with-current-buffer b2 (goto-char (point-min)))) + (maxp1 (with-current-buffer b1 (point-max))) + (maxp2 (with-current-buffer b2 (point-max))) + (op1 -1) (op2 -1) + progress size) + (while (not (and (eq p1 op1) (eq p2 op2))) + ;; If both windows have whitespace optionally skip over it. + (when whitespace + ;; skip-syntax-* doesn't count \n + (with-current-buffer b1 + (goto-char p1) + (skip-chars-forward " \t\n\r\f\v") + (setq p1 (point))) + (with-current-buffer b2 + (goto-char p2) + (skip-chars-forward " \t\n\r\f\v") + (setq p2 (point)))) + (setq size (min (- maxp1 p1) (- maxp2 p2))) + (setq progress (compare-buffer-substrings b2 p2 (+ size p2) + b1 p1 (+ size p1))) + (setq progress (if (zerop progress) size (1- (abs progress)))) + (setq op1 p1 op2 p2 + p1 (+ p1 progress) + p2 (+ p2 progress))) + ;; Return value + (if (and (eq p1 maxp1) (eq p2 maxp2)) + nil p1)))) + +(defun verilog-diff-file-with-buffer (f1 b2 &optional whitespace show) + "View the differences between file F1 and buffer B2. +This requires the external program `diff-command' to be in your `exec-path', +and uses `diff-switches' in which you may want to have \"-u\" flag. +Ignores WHITESPACE if t, and writes output to stdout if SHOW." + ;; Similar to `diff-buffer-with-file' but works on XEmacs, and doesn't + ;; call `diff' as `diff' has different calling semantics on different + ;; versions of Emacs. + (if (not (file-exists-p f1)) + (message "Buffer %s has no associated file on disc" (buffer-name b2)) + (with-temp-buffer "*Verilog-Diff*" + (let ((outbuf (current-buffer)) + (f2 (make-temp-file "vm-diff-auto-"))) + (unwind-protect + (progn + (with-current-buffer b2 + (save-restriction + (widen) + (write-region (point-min) (point-max) f2 nil 'nomessage))) + (call-process diff-command nil outbuf t + diff-switches ;; User may want -u in diff-switches + (if whitespace "-b" "") + f1 f2) + ;; Print out results. Alternatively we could have call-processed + ;; ourself, but this way we can reuse diff switches + (when show + (with-current-buffer outbuf (message "%s" (buffer-string)))))) + (sit-for 0) + (when (file-exists-p f2) + (delete-file f2)))))) + +(defun verilog-diff-report (b1 b2 diffpt) + "Report differences detected with `verilog-diff-auto'. +Differences are between buffers B1 and B2, starting at point +DIFFPT. This function is called via `verilog-diff-function'." + (let ((name1 (with-current-buffer b1 (buffer-file-name)))) + (message "%%Warning: %s:%d: Difference in AUTO expansion found" + name1 (with-current-buffer b1 (1+ (count-lines (point-min) (point))))) + (cond (noninteractive + (verilog-diff-file-with-buffer name1 b2 t t)) + (t + (ediff-buffers b1 b2))))) + +(defun verilog-diff-auto () + "Expand AUTOs in a temporary buffer and indicate any changes. +Whitespace differences are ignored to determine identicalness, but +once a difference is detected, whitespace differences may be shown. + +To call this from the command line, see \\[verilog-batch-diff-auto]. + +The action on differences is selected with +`verilog-diff-function'. The default is `verilog-diff-report' +which will report an error and run `ediff' in interactive mode, +or `diff' in batch mode." + (interactive) + (let ((b1 (current-buffer)) b2 diffpt + (name1 (buffer-file-name)) + (newname "*Verilog-Diff*")) + (save-excursion + (when (get-buffer newname) + (kill-buffer newname)) + (setq b2 (let (buffer-file-name) ;; Else clone is upset + (clone-buffer newname))) + (with-current-buffer b2 + ;; auto requires the filename, but can't have same filename in two + ;; buffers; so override both b1 and b2's names + (let ((buffer-file-name name1)) + (unwind-protect + (progn + (with-current-buffer b1 (setq buffer-file-name nil)) + (verilog-auto) + (when (not verilog-auto-star-save) + (verilog-delete-auto-star-implicit))) + ;; Restore name if unwind + (with-current-buffer b1 (setq buffer-file-name name1))))) + ;; + (setq diffpt (verilog-diff-buffers-p b1 b2 t)) + (cond ((not diffpt) + (unless noninteractive (message "AUTO expansion identical")) + (kill-buffer newname)) ;; Nice to cleanup after oneself + (t + (funcall verilog-diff-function b1 b2 diffpt))) + ;; Return result of compare + diffpt))) + + +;; ;; Auto save ;; @@ -9483,14 +10204,19 @@ (concat "\\<" (nth 0 (car check-values)) "\\>") (concat "(" (nth 1 (car check-values)) ")") t t vl-bits) + vl-mbits (verilog-string-replace-matches + (concat "\\<" (nth 0 (car check-values)) "\\>") + (concat "(" (nth 1 (car check-values)) ")") + t t vl-mbits) check-values (cdr check-values))) - (setq vl-bits (verilog-simplify-range-expression vl-bits))) ; Not in the loop for speed + (setq vl-bits (verilog-simplify-range-expression vl-bits) + vl-mbits (verilog-simplify-range-expression vl-mbits) + vl-width (verilog-make-width-expression vl-bits))) ; Not in the loop for speed ;; Default net value if not found (setq tpl-net (concat port (if vl-modport (concat "." vl-modport) "") (if (verilog-sig-multidim port-st) - (concat "/*" (verilog-sig-multidim-string port-st) - vl-bits "*/") + (concat "/*" vl-mbits vl-bits "*/") (concat vl-bits)))) ;; Find template (cond (tpl-ass ; Template of exact port name @@ -9536,20 +10262,37 @@ (cond (tpl-ass (indent-to (+ (if (< verilog-auto-inst-column 48) 24 16) verilog-auto-inst-column)) - (if verilog-auto-inst-template-numbers - (verilog-insert " // Templated" - " T" (int-to-string (nth 2 tpl-ass)) - " L" (int-to-string (nth 3 tpl-ass))) - (verilog-insert " // Templated"))) + ;; verilog-insert requires the complete comment in one call - including the newline + (cond ((equal verilog-auto-inst-template-numbers `lhs) + (verilog-insert " // Templated" + " LHS: " (nth 0 tpl-ass) + "\n")) + (verilog-auto-inst-template-numbers + (verilog-insert " // Templated" + " T" (int-to-string (nth 2 tpl-ass)) + " L" (int-to-string (nth 3 tpl-ass)) + "\n")) + (t + (verilog-insert " // Templated\n")))) (for-star (indent-to (+ (if (< verilog-auto-inst-column 48) 24 16) verilog-auto-inst-column)) - (verilog-insert " // Implicit .\*"))) ;For some reason the . or * must be escaped... - (insert "\n"))) + (verilog-insert " // Implicit .\*\n")) ;For some reason the . or * must be escaped... + (t + (insert "\n"))))) ;;(verilog-auto-inst-port (list "foo" "[5:0]") 10 (list (list "foo" "a@\"(% (+ @ 1) 4)\"a")) "3") ;;(x "incom[@\"(+ (* 8 @) 7)\":@\"(* 8 @)\"]") ;;(x ".out (outgo[@\"(concat (+ (* 8 @) 7) \\\":\\\" ( * 8 @))\"]));") +(defun verilog-auto-inst-port-list (sig-list indent-pt tpl-list tpl-num for-star par-values) + "For `verilog-auto-inst' print a list of ports using `verilog-auto-inst-port'." + (when verilog-auto-inst-sort + (setq sig-list (sort (copy-alist sig-list) `verilog-signals-sort-compare))) + (mapc (lambda (port) + (verilog-auto-inst-port port indent-pt + tpl-list tpl-num for-star par-values)) + sig-list)) + (defun verilog-auto-inst-first () "Insert , etc before first ever port in this instant, as part of \\[verilog-auto-inst]." ;; Do we need a trailing comma? @@ -9558,7 +10301,7 @@ ;; Insert first port on new line (insert "\n") ;; Must insert before search, so point will move forward if insert comma (save-excursion - (verilog-re-search-backward "[^ \t\n\f]" nil nil) + (verilog-re-search-backward-quick "[^ \t\n\f]" nil nil) (when (looking-at ")\\|\\*") ;; Generally don't insert, unless we are fairly sure (forward-char 1) (insert ",")))) @@ -9592,6 +10335,9 @@ and delete them before saving unless `verilog-auto-star-save' is set. See `verilog-auto-star' for more information. +The pins are printed in declaration order or alphabetically, +based on the `verilog-auto-inst-sort' variable. + Limitations: Module names must be resolvable to filenames by adding a `verilog-library-extensions', and being found in the same directory, or @@ -9719,6 +10465,22 @@ .NotInTemplate (NotInTemplate), .ptl_bus (ptl_busnew[3:0]), // Templated .... + + +Multiple Module Templates: + + The same template lines can be applied to multiple modules with + the syntax as follows: + + /* InstModuleA AUTO_TEMPLATE + InstModuleB AUTO_TEMPLATE + InstModuleC AUTO_TEMPLATE + InstModuleD AUTO_TEMPLATE ( + .ptl_bus (ptl_busnew[]), + ); + */ + + Note there is only one AUTO_TEMPLATE opening parenthesis. @ Templates: @@ -9899,18 +10661,15 @@ ;; Find submodule's signals and dump (let ((sig-list (and (equal (verilog-modi-get-type submodi) "interface") (verilog-signals-not-in - (append (verilog-decls-get-wires submoddecls) - (verilog-decls-get-regs submoddecls)) + (verilog-decls-get-vars submoddecls) skip-pins))) (vl-dir "interfaced")) (when sig-list (when (not did-first) (verilog-auto-inst-first) (setq did-first t)) ;; Note these are searched for in verilog-read-sub-decls. (verilog-insert-indent "// Interfaced\n") - (mapc (lambda (port) - (verilog-auto-inst-port port indent-pt - tpl-list tpl-num for-star par-values)) - sig-list))) + (verilog-auto-inst-port-list sig-list indent-pt + tpl-list tpl-num for-star par-values))) (let ((sig-list (verilog-signals-not-in (verilog-decls-get-interfaces submoddecls) skip-pins)) @@ -9919,10 +10678,8 @@ (when (not did-first) (verilog-auto-inst-first) (setq did-first t)) ;; Note these are searched for in verilog-read-sub-decls. (verilog-insert-indent "// Interfaces\n") - (mapc (lambda (port) - (verilog-auto-inst-port port indent-pt - tpl-list tpl-num for-star par-values)) - sig-list))) + (verilog-auto-inst-port-list sig-list indent-pt + tpl-list tpl-num for-star par-values))) (let ((sig-list (verilog-signals-not-in (verilog-decls-get-outputs submoddecls) skip-pins)) @@ -9930,10 +10687,8 @@ (when sig-list (when (not did-first) (verilog-auto-inst-first) (setq did-first t)) (verilog-insert-indent "// Outputs\n") - (mapc (lambda (port) - (verilog-auto-inst-port port indent-pt - tpl-list tpl-num for-star par-values)) - sig-list))) + (verilog-auto-inst-port-list sig-list indent-pt + tpl-list tpl-num for-star par-values))) (let ((sig-list (verilog-signals-not-in (verilog-decls-get-inouts submoddecls) skip-pins)) @@ -9941,10 +10696,8 @@ (when sig-list (when (not did-first) (verilog-auto-inst-first) (setq did-first t)) (verilog-insert-indent "// Inouts\n") - (mapc (lambda (port) - (verilog-auto-inst-port port indent-pt - tpl-list tpl-num for-star par-values)) - sig-list))) + (verilog-auto-inst-port-list sig-list indent-pt + tpl-list tpl-num for-star par-values))) (let ((sig-list (verilog-signals-not-in (verilog-decls-get-inputs submoddecls) skip-pins)) @@ -9952,10 +10705,8 @@ (when sig-list (when (not did-first) (verilog-auto-inst-first) (setq did-first t)) (verilog-insert-indent "// Inputs\n") - (mapc (lambda (port) - (verilog-auto-inst-port port indent-pt - tpl-list tpl-num for-star par-values)) - sig-list))) + (verilog-auto-inst-port-list sig-list indent-pt + tpl-list tpl-num for-star par-values))) ;; Kill extra semi (save-excursion (cond (did-first @@ -10058,10 +10809,8 @@ (when (not did-first) (verilog-auto-inst-first) (setq did-first t)) ;; Note these are searched for in verilog-read-sub-decls. (verilog-insert-indent "// Parameters\n") - (mapc (lambda (port) - (verilog-auto-inst-port port indent-pt - tpl-list tpl-num nil nil)) - sig-list))) + (verilog-auto-inst-port-list sig-list indent-pt + tpl-list tpl-num nil nil))) ;; Kill extra semi (save-excursion (cond (did-first @@ -10076,7 +10825,8 @@ (defun verilog-auto-reg () "Expand AUTOREG statements, as part of \\[verilog-auto]. Make reg statements for any output that isn't already declared, -and isn't a wire output from a block. +and isn't a wire output from a block. `verilog-auto-wire-type' +may be used to change the datatype of the declarations. Limitations: This ONLY detects outputs of AUTOINSTants (see `verilog-read-sub-decls'). @@ -10111,8 +10861,7 @@ (modsubdecls (verilog-modi-get-sub-decls modi)) (sig-list (verilog-signals-not-in (verilog-decls-get-outputs moddecls) - (append (verilog-decls-get-wires moddecls) - (verilog-decls-get-regs moddecls) + (append (verilog-decls-get-vars moddecls) (verilog-decls-get-assigns moddecls) (verilog-decls-get-consts moddecls) (verilog-decls-get-gparams moddecls) @@ -10122,8 +10871,7 @@ (forward-line 1) (when sig-list (verilog-insert-indent "// Beginning of automatic regs (for this module's undeclared outputs)\n") - (verilog-insert-definition sig-list "reg" indent-pt nil) - (verilog-modi-cache-add-regs modi sig-list) + (verilog-insert-definition modi sig-list "reg" indent-pt nil) (verilog-insert-indent "// End of automatics\n"))))) (defun verilog-auto-reg-input () @@ -10173,18 +10921,40 @@ (verilog-signals-not-in (append (verilog-subdecls-get-inputs modsubdecls) (verilog-subdecls-get-inouts modsubdecls)) - (verilog-decls-get-signals moddecls))))) + (append (verilog-decls-get-signals moddecls) + (verilog-decls-get-assigns moddecls)))))) (forward-line 1) (when sig-list (verilog-insert-indent "// Beginning of automatic reg inputs (for undeclared instantiated-module inputs)\n") - (verilog-insert-definition sig-list "reg" indent-pt nil) - (verilog-modi-cache-add-regs modi sig-list) + (verilog-insert-definition modi sig-list "reg" indent-pt nil) (verilog-insert-indent "// End of automatics\n"))))) +(defun verilog-auto-logic () + "Expand AUTOLOGIC statements, as part of \\[verilog-auto]. +Make wire statements using the SystemVerilog logic keyword. +This is currently equivelent to: + + /*AUTOWIRE*/ + +with the below at the bottom of the file + + // Local Variables: + // verilog-auto-logic-type:\"logic\" + // End: + +In the future AUTOLOGIC may declare additional identifiers, +while AUTOWIRE will not." + (save-excursion + (unless verilog-auto-wire-type + (set (make-local-variable 'verilog-auto-wire-type) + "logic")) + (verilog-auto-wire))) + (defun verilog-auto-wire () "Expand AUTOWIRE statements, as part of \\[verilog-auto]. Make wire statements for instantiations outputs that aren't -already declared. +already declared. `verilog-auto-wire-type' may be used to change +the datatype of the declarations. Limitations: This ONLY detects outputs of AUTOINSTants (see `verilog-read-sub-decls'), @@ -10240,15 +11010,13 @@ (forward-line 1) (when sig-list (verilog-insert-indent "// Beginning of automatic wires (for undeclared instantiated-module outputs)\n") - (verilog-insert-definition sig-list "wire" indent-pt nil) - (verilog-modi-cache-add-wires modi sig-list) + (verilog-insert-definition modi sig-list "wire" indent-pt nil) (verilog-insert-indent "// End of automatics\n") - (when nil ;; Too slow on huge modules, plus makes everyone's module change - (beginning-of-line) - (setq pnt (point)) - (verilog-pretty-declarations quiet) - (goto-char pnt) - (verilog-pretty-expr t "//")))))) + ;; We used to optionally call verilog-pretty-declarations and + ;; verilog-pretty-expr here, but it's too slow on huge modules, + ;; plus makes everyone's module change. Finally those call + ;; syntax-ppss which is broken when change hooks are disabled. + )))) (defun verilog-auto-output (&optional with-params) "Expand AUTOOUTPUT statements, as part of \\[verilog-auto]. @@ -10304,7 +11072,7 @@ (let* ((indent-pt (current-indentation)) (regexp (and with-params (nth 0 (verilog-read-auto-params 1)))) - (v2k (verilog-in-paren)) + (v2k (verilog-in-paren-quick)) (modi (verilog-modi-current)) (moddecls (verilog-modi-get-decls modi)) (modsubdecls (verilog-modi-get-sub-decls modi)) @@ -10323,8 +11091,7 @@ (when v2k (verilog-repair-open-comma)) (when sig-list (verilog-insert-indent "// Beginning of automatic outputs (from unused autoinst outputs)\n") - (verilog-insert-definition sig-list "output" indent-pt v2k) - (verilog-modi-cache-add-outputs modi sig-list) + (verilog-insert-definition modi sig-list "output" indent-pt v2k) (verilog-insert-indent "// End of automatics\n")) (when v2k (verilog-repair-close-comma))))) @@ -10363,7 +11130,7 @@ (save-excursion ;;Point must be at insertion point (let* ((indent-pt (current-indentation)) - (v2k (verilog-in-paren)) + (v2k (verilog-in-paren-quick)) (modi (verilog-modi-current)) (moddecls (verilog-modi-get-decls modi)) (sig-list (verilog-signals-combine-bus @@ -10374,8 +11141,7 @@ (when v2k (verilog-repair-open-comma)) (when sig-list (verilog-insert-indent "// Beginning of automatic outputs (every signal)\n") - (verilog-insert-definition sig-list "output" indent-pt v2k) - (verilog-modi-cache-add-outputs modi sig-list) + (verilog-insert-definition modi sig-list "output" indent-pt v2k) (verilog-insert-indent "// End of automatics\n")) (when v2k (verilog-repair-close-comma))))) @@ -10432,7 +11198,7 @@ (let* ((indent-pt (current-indentation)) (regexp (and with-params (nth 0 (verilog-read-auto-params 1)))) - (v2k (verilog-in-paren)) + (v2k (verilog-in-paren-quick)) (modi (verilog-modi-current)) (moddecls (verilog-modi-get-decls modi)) (modsubdecls (verilog-modi-get-sub-decls modi)) @@ -10440,8 +11206,7 @@ (verilog-subdecls-get-inputs modsubdecls) (append (verilog-decls-get-inputs moddecls) (verilog-decls-get-inouts moddecls) - (verilog-decls-get-wires moddecls) - (verilog-decls-get-regs moddecls) + (verilog-decls-get-vars moddecls) (verilog-decls-get-consts moddecls) (verilog-decls-get-gparams moddecls) (verilog-subdecls-get-interfaced modsubdecls) @@ -10456,8 +11221,7 @@ (when v2k (verilog-repair-open-comma)) (when sig-list (verilog-insert-indent "// Beginning of automatic inputs (from unused autoinst inputs)\n") - (verilog-insert-definition sig-list "input" indent-pt v2k) - (verilog-modi-cache-add-inputs modi sig-list) + (verilog-insert-definition modi sig-list "input" indent-pt v2k) (verilog-insert-indent "// End of automatics\n")) (when v2k (verilog-repair-close-comma))))) @@ -10514,7 +11278,7 @@ (let* ((indent-pt (current-indentation)) (regexp (and with-params (nth 0 (verilog-read-auto-params 1)))) - (v2k (verilog-in-paren)) + (v2k (verilog-in-paren-quick)) (modi (verilog-modi-current)) (moddecls (verilog-modi-get-decls modi)) (modsubdecls (verilog-modi-get-sub-decls modi)) @@ -10534,18 +11298,18 @@ (when v2k (verilog-repair-open-comma)) (when sig-list (verilog-insert-indent "// Beginning of automatic inouts (from unused autoinst inouts)\n") - (verilog-insert-definition sig-list "inout" indent-pt v2k) - (verilog-modi-cache-add-inouts modi sig-list) + (verilog-insert-definition modi sig-list "inout" indent-pt v2k) (verilog-insert-indent "// End of automatics\n")) (when v2k (verilog-repair-close-comma))))) -(defun verilog-auto-inout-module (&optional complement) +(defun verilog-auto-inout-module (&optional complement all-in) "Expand AUTOINOUTMODULE statements, as part of \\[verilog-auto]. Take input/output/inout statements from the specified module and insert into the current module. This is useful for making null templates and shell modules which need to have identical I/O with another module. Any I/O which are already defined in this module will not be redefined. -For the complement of this function, see `verilog-auto-inout-comp'. +For the complement of this function, see `verilog-auto-inout-comp', +and to make monitors with all inputs, see `verilog-auto-inout-in'. Limitations: If placed inside the parenthesis of a module declaration, it creates @@ -10610,22 +11374,29 @@ ;; Note this may raise an error (when (setq submodi (verilog-modi-lookup submod t)) (let* ((indent-pt (current-indentation)) - (v2k (verilog-in-paren)) + (v2k (verilog-in-paren-quick)) (modi (verilog-modi-current)) (moddecls (verilog-modi-get-decls modi)) (submoddecls (verilog-modi-get-decls submodi)) (sig-list-i (verilog-signals-not-in - (if complement - (verilog-decls-get-outputs submoddecls) - (verilog-decls-get-inputs submoddecls)) + (cond (all-in + (append + (verilog-decls-get-inputs submoddecls) + (verilog-decls-get-inouts submoddecls) + (verilog-decls-get-outputs submoddecls))) + (complement + (verilog-decls-get-outputs submoddecls)) + (t (verilog-decls-get-inputs submoddecls))) (append (verilog-decls-get-inputs moddecls)))) (sig-list-o (verilog-signals-not-in - (if complement - (verilog-decls-get-inputs submoddecls) - (verilog-decls-get-outputs submoddecls)) + (cond (all-in nil) + (complement + (verilog-decls-get-inputs submoddecls)) + (t (verilog-decls-get-outputs submoddecls))) (append (verilog-decls-get-outputs moddecls)))) (sig-list-io (verilog-signals-not-in - (verilog-decls-get-inouts submoddecls) + (cond (all-in nil) + (t (verilog-decls-get-inouts submoddecls))) (append (verilog-decls-get-inouts moddecls)))) (sig-list-if (verilog-signals-not-in (verilog-decls-get-interfaces submoddecls) @@ -10647,13 +11418,10 @@ (when (or sig-list-i sig-list-o sig-list-io) (verilog-insert-indent "// Beginning of automatic in/out/inouts (from specific module)\n") ;; Don't sort them so a upper AUTOINST will match the main module - (verilog-insert-definition sig-list-o "output" indent-pt v2k t) - (verilog-insert-definition sig-list-io "inout" indent-pt v2k t) - (verilog-insert-definition sig-list-i "input" indent-pt v2k t) - (verilog-insert-definition sig-list-if "interface" indent-pt v2k t) - (verilog-modi-cache-add-inputs modi sig-list-i) - (verilog-modi-cache-add-outputs modi sig-list-o) - (verilog-modi-cache-add-inouts modi sig-list-io) + (verilog-insert-definition modi sig-list-o "output" indent-pt v2k t) + (verilog-insert-definition modi sig-list-io "inout" indent-pt v2k t) + (verilog-insert-definition modi sig-list-i "input" indent-pt v2k t) + (verilog-insert-definition modi sig-list-if "interface" indent-pt v2k t) (verilog-insert-indent "// End of automatics\n")) (when v2k (verilog-repair-close-comma))))))) @@ -10707,7 +11475,58 @@ same expansion will result from only extracting signals starting with i: /*AUTOINOUTCOMP(\"ExampMain\",\"^i\")*/" - (verilog-auto-inout-module t)) + (verilog-auto-inout-module t nil)) + +(defun verilog-auto-inout-in () + "Expand AUTOINOUTIN statements, as part of \\[verilog-auto]. +Take input/output/inout statements from the specified module and +insert them as all inputs into the current module. This is +useful for making monitor modules which need to see all signals +as inputs based on another module. Any I/O which are already +defined in this module will not be redefined. See also +`verilog-auto-inout-module'. + +Limitations: + If placed inside the parenthesis of a module declaration, it creates + Verilog 2001 style, else uses Verilog 1995 style. + + Concatenation and outputting partial busses is not supported. + + Module names must be resolvable to filenames. See `verilog-auto-inst'. + + Signals are not inserted in the same order as in the original module, + though they will appear to be in the same order to a AUTOINST + instantiating either module. + +An example: + + module ExampShell (/*AUTOARG*/); + /*AUTOINOUTIN(\"ExampMain\")*/ + endmodule + + module ExampMain (i,o,io); + input i; + output o; + inout io; + endmodule + +Typing \\[verilog-auto] will make this into: + + module ExampShell (/*AUTOARG*/i,o,io); + /*AUTOINOUTIN(\"ExampMain\")*/ + // Beginning of automatic in/out/inouts (from specific module) + input i; + input io; + input o; + // End of automatics + endmodule + +You may also provide an optional regular expression, in which case only +signals matching the regular expression will be included. For example the +same expansion will result from only extracting signals starting with i: + + /*AUTOINOUTCOMP(\"ExampMain\",\"^i\")*/" + (verilog-auto-inout-module nil t)) (defun verilog-auto-insert-lisp () "Expand AUTOINSERTLISP statements, as part of \\[verilog-auto]. @@ -10756,7 +11575,7 @@ (forward-char) (point))) ;; Closing paren (cmd-beg-pt (save-excursion (goto-char cmd-end-pt) - (backward-sexp 1) + (backward-sexp 1) ;; Inside comment (point))) ;; Beginning paren (cmd (buffer-substring-no-properties cmd-beg-pt cmd-end-pt))) (forward-line 1) @@ -10776,7 +11595,9 @@ (sig-list (verilog-signals-not-params (verilog-signals-not-in (verilog-alw-get-inputs sigss) (append (and (not verilog-auto-sense-include-inputs) - (verilog-alw-get-outputs sigss)) + (verilog-alw-get-outputs-delayed sigss)) + (and (not verilog-auto-sense-include-inputs) + (verilog-alw-get-outputs-immediate sigss)) (verilog-alw-get-temps sigss) (verilog-decls-get-consts moddecls) (verilog-decls-get-gparams moddecls) @@ -10840,7 +11661,7 @@ (save-excursion ;; Find beginning (let* ((start-pt (save-excursion - (verilog-re-search-backward "(" nil t) + (verilog-re-search-backward-quick "(" nil t) (point))) (indent-pt (save-excursion (or (and (goto-char start-pt) (1+ (current-column))) @@ -10848,9 +11669,7 @@ (modi (verilog-modi-current)) (moddecls (verilog-modi-get-decls modi)) (sig-memories (verilog-signals-memory - (append - (verilog-decls-get-regs moddecls) - (verilog-decls-get-wires moddecls)))) + (verilog-decls-get-vars moddecls))) sig-list not-first presense-sigs) ;; Read signals in always, eliminate outputs from sense list (setq presense-sigs (verilog-signals-from-signame @@ -10863,11 +11682,11 @@ (if (not (eq tlen (length sig-list))) (verilog-insert " /*memory or*/ ")))) (if (and presense-sigs ;; Add a "or" if not "(.... or /*AUTOSENSE*/" (save-excursion (goto-char (point)) - (verilog-re-search-backward "[a-zA-Z0-9$_.%`]+" start-pt t) - (verilog-re-search-backward "\\s-" start-pt t) + (verilog-re-search-backward-quick "[a-zA-Z0-9$_.%`]+" start-pt t) + (verilog-re-search-backward-quick "\\s-" start-pt t) (while (looking-at "\\s-`endif") - (verilog-re-search-backward "[a-zA-Z0-9$_.%`]+" start-pt t) - (verilog-re-search-backward "\\s-" start-pt t)) + (verilog-re-search-backward-quick "[a-zA-Z0-9$_.%`]+" start-pt t) + (verilog-re-search-backward-quick "\\s-" start-pt t)) (not (looking-at "\\s-or\\b")))) (setq not-first t)) (setq sig-list (sort sig-list `verilog-signals-sort-compare)) @@ -10889,9 +11708,13 @@ Limitations: AUTORESET will not clear memories. - AUTORESET uses <= if there are any <= assignments in the block, + AUTORESET uses <= if the signal has a <= assignment in the block, else it uses =. + If <= is used, all = assigned variables are ignored if + `verilog-auto-reset-blocking-in-non' is nil; they are presumed + to be temporaries. + /*AUTORESET*/ presumes that any signals mentioned between the previous begin/case/if statement and the AUTORESET comment are being reset manually and should not be automatically reset. This includes omitting any signals @@ -10927,12 +11750,12 @@ /*AUTORESET*/ // Beginning of autoreset for uninitialized flops a <= 0; - b <= 0; + b = 0; // if `verilog-auto-reset-blocking-in-non' true // End of automatics end else begin a <= in_a; - b <= in_b; + b = in_b; c <= in_c; end end" @@ -10944,22 +11767,24 @@ (modi (verilog-modi-current)) (moddecls (verilog-modi-get-decls modi)) (all-list (verilog-decls-get-signals moddecls)) - sigss sig-list prereset-sigs assignment-str) + sigss sig-list dly-list prereset-sigs) ;; Read signals in always, eliminate outputs from reset list (setq prereset-sigs (verilog-signals-from-signame (save-excursion (verilog-read-signals (save-excursion - (verilog-re-search-backward "\\(@\\|\\\\|\\\\|\\\\)" nil t) + (verilog-re-search-backward-quick "\\(@\\|\\\\|\\\\|\\\\)" nil t) (point)) (point))))) (save-excursion - (verilog-re-search-backward "@" nil t) + (verilog-re-search-backward-quick "@" nil t) (setq sigss (verilog-read-always-signals))) - (setq assignment-str (if (verilog-alw-get-uses-delayed sigss) - (concat " <= " verilog-assignment-delay) - " = ")) - (setq sig-list (verilog-signals-not-in (verilog-alw-get-outputs sigss) + (setq dly-list (verilog-alw-get-outputs-delayed sigss)) + (setq sig-list (verilog-signals-not-in (append + (verilog-alw-get-outputs-delayed sigss) + (when (or (not (verilog-alw-get-uses-delayed sigss)) + verilog-auto-reset-blocking-in-non) + (verilog-alw-get-outputs-immediate sigss))) (append (verilog-alw-get-temps sigss) prereset-sigs))) @@ -10967,17 +11792,18 @@ (when sig-list (insert "\n"); (verilog-insert-indent "// Beginning of autoreset for uninitialized flops\n"); - (indent-to indent-pt) (while sig-list (let ((sig (or (assoc (verilog-sig-name (car sig-list)) all-list) ;; As sig-list has no widths (car sig-list)))) + (indent-to indent-pt) (insert (verilog-sig-name sig) - assignment-str + (if (assoc (verilog-sig-name sig) dly-list) + (concat " <= " verilog-assignment-delay) + " = ") (verilog-sig-tieoff sig (not verilog-auto-reset-widths)) ";\n") - (indent-to indent-pt) (setq sig-list (cdr sig-list)))) - (verilog-insert "// End of automatics"))))) + (verilog-insert-indent "// End of automatics"))))) (defun verilog-auto-tieoff () "Expand AUTOTIEOFF statements, as part of \\[verilog-auto]. @@ -10996,6 +11822,9 @@ You can add signals you do not want included in AUTOTIEOFF with `verilog-auto-tieoff-ignore-regexp'. +`verilog-auto-wire-type' may be used to change the datatype of +the declarations. + An example of making a stub for another module: module ExampStub (/*AUTOINST*/); @@ -11031,8 +11860,7 @@ (modsubdecls (verilog-modi-get-sub-decls modi)) (sig-list (verilog-signals-not-in (verilog-decls-get-outputs moddecls) - (append (verilog-decls-get-wires moddecls) - (verilog-decls-get-regs moddecls) + (append (verilog-decls-get-vars moddecls) (verilog-decls-get-assigns moddecls) (verilog-decls-get-consts moddecls) (verilog-decls-get-gparams moddecls) @@ -11045,10 +11873,14 @@ (forward-line 1) (verilog-insert-indent "// Beginning of automatic tieoffs (for this module's unterminated outputs)\n") (setq sig-list (sort (copy-alist sig-list) `verilog-signals-sort-compare)) - (verilog-modi-cache-add-wires modi sig-list) ; Before we trash list + (verilog-modi-cache-add-vars modi sig-list) ; Before we trash list (while sig-list (let ((sig (car sig-list))) - (verilog-insert-one-definition sig "wire" indent-pt) + (cond ((equal verilog-auto-tieoff-declaration "assign") + (indent-to indent-pt) + (insert "assign " (verilog-sig-name sig))) + (t + (verilog-insert-one-definition sig verilog-auto-tieoff-declaration indent-pt))) (indent-to (max 48 (+ indent-pt 40))) (insert "= " (verilog-sig-tieoff sig) ";\n") @@ -11151,24 +11983,28 @@ \(Annoying, but that's what Synopsys's dc_shell FSM reader requires.) Next, registers which that enum applies to are also tagged with the same -enum. Synopsys also suggests labeling state vectors, but `verilog-mode' -doesn't care. +enum. Finally, a AUTOASCIIENUM command is used. The first parameter is the name of the signal to be decoded. - If and only if the first parameter width is 2^(number of states - in enum) and does NOT match the width of the enum, the signal - is assumed to be a one hot decode. Otherwise, it's a normal - encoded state vector. The second parameter is the name to store the ASCII code into. For the signal foo, I suggest the name _foo__ascii, where the leading _ indicates a signal that is just for simulation, and the magic characters _ascii tell viewers like Dinotrace to display in ASCII format. - The final optional parameter is a string which will be removed from the - state names. + The third optional parameter is a string which will be removed + from the state names. It defaults to "" which removes nothing. + + The fourth optional parameter is \"onehot\" to force one-hot + decoding. If unspecified, if and only if the first parameter + width is 2^(number of states in enum) and does NOT match the + width of the enum, the signal is assumed to be a one hot + decode. Otherwise, it's a normal encoded state vector. + + `verilog-auto-wire-type' may be used to change the datatype of + the declarations. An example: @@ -11202,10 +12038,13 @@ end // End of automatics" (save-excursion - (let* ((params (verilog-read-auto-params 2 3)) + (let* ((params (verilog-read-auto-params 2 4)) (undecode-name (nth 0 params)) (ascii-name (nth 1 params)) - (elim-regexp (nth 2 params)) + (elim-regexp (and (nth 2 params) + (not (equal (nth 2 params) "")) + (nth 2 params))) + (one-hot-flag (nth 3 params)) ;; (indent-pt (current-indentation)) (modi (verilog-modi-current)) @@ -11213,11 +12052,10 @@ ;; (sig-list-consts (append (verilog-decls-get-consts moddecls) (verilog-decls-get-gparams moddecls))) - (sig-list-all (append (verilog-decls-get-regs moddecls) + (sig-list-all (append (verilog-decls-get-vars moddecls) (verilog-decls-get-outputs moddecls) (verilog-decls-get-inouts moddecls) - (verilog-decls-get-inputs moddecls) - (verilog-decls-get-wires moddecls))) + (verilog-decls-get-inputs moddecls))) ;; (undecode-sig (or (assoc undecode-name sig-list-all) (error "%s: Signal %s not found in design" (verilog-point-text) undecode-name))) @@ -11229,13 +12067,15 @@ (error "%s: No state definitions for %s" (verilog-point-text) undecode-enum)) nil)) ;; - (one-hot (and ;; width(enum) != width(sig) - (or (not (verilog-sig-bits (car enum-sigs))) - (not (equal (verilog-sig-width (car enum-sigs)) - (verilog-sig-width undecode-sig)))) - ;; count(enums) == width(sig) - (equal (number-to-string (length enum-sigs)) - (verilog-sig-width undecode-sig)))) + (one-hot (or + (string-match "onehot" (or one-hot-flag "")) + (and ;; width(enum) != width(sig) + (or (not (verilog-sig-bits (car enum-sigs))) + (not (equal (verilog-sig-width (car enum-sigs)) + (verilog-sig-width undecode-sig)))) + ;; count(enums) == width(sig) + (equal (number-to-string (length enum-sigs)) + (verilog-sig-width undecode-sig))))) (enum-chars 0) (ascii-chars 0)) ;; @@ -11252,13 +12092,11 @@ (verilog-insert-indent "// Beginning of automatic ASCII enum decoding\n") (let ((decode-sig-list (list (list ascii-name (format "[%d:0]" (- (* ascii-chars 8) 1)) (concat "Decode of " undecode-name) nil nil)))) - (verilog-insert-definition decode-sig-list "reg" indent-pt nil) - (verilog-modi-cache-add-regs modi decode-sig-list)) + (verilog-insert-definition modi decode-sig-list "reg" indent-pt nil)) ;; (verilog-insert-indent "always @(" undecode-name ") begin\n") (setq indent-pt (+ indent-pt verilog-indent-level)) - (indent-to indent-pt) - (insert "case ({" undecode-name "})\n") + (verilog-insert-indent "case ({" undecode-name "})\n") (setq indent-pt (+ indent-pt verilog-case-indent)) ;; (let ((tmp-sigs enum-sigs) @@ -11271,7 +12109,9 @@ (concat (format chrfmt (concat (if one-hot "(") - (if one-hot (verilog-sig-width undecode-sig)) + ;; Use enum-sigs length as that's numeric + ;; verilog-sig-width undecode-sig might not be. + (if one-hot (number-to-string (length enum-sigs))) ;; We use a shift instead of var[index] ;; so that a non-one hot value will show as error. (if one-hot "'b1<<") @@ -11326,6 +12166,8 @@ Use \\[verilog-delete-auto] to remove the AUTOs. +Use \\[verilog-diff-auto] to see differences in AUTO expansion. + Use \\[verilog-inject-auto] to insert AUTOs for the first time. Use \\[verilog-faq] for a pointer to frequently asked questions. @@ -11348,11 +12190,14 @@ Likewise, you can delete or inject AUTOs with: emacs --batch -f verilog-batch-delete-auto emacs --batch -f verilog-batch-inject-auto +Or check if AUTOs have the same expansion + emacs --batch -f verilog-batch-diff-auto Using \\[describe-function], see also: `verilog-auto-arg' for AUTOARG module instantiations `verilog-auto-ascii-enum' for AUTOASCIIENUM enumeration decoding - `verilog-auto-inout-comp' for AUTOINOUTCOMP copy complemented i/o + `verilog-auto-inout-comp' for AUTOINOUTCOMP copy complemented i/o + `verilog-auto-inout-in' for AUTOINOUTIN inputs for all i/o `verilog-auto-inout-module' for AUTOINOUTMODULE copying i/o from elsewhere `verilog-auto-inout' for AUTOINOUT making hierarchy inouts `verilog-auto-input' for AUTOINPUT making hierarchy inputs @@ -11360,6 +12205,7 @@ `verilog-auto-inst' for AUTOINST instantiation pins `verilog-auto-star' for AUTOINST .* SystemVerilog pins `verilog-auto-inst-param' for AUTOINSTPARAM instantiation params + `verilog-auto-logic' for AUTOLOGIC declaring logic signals `verilog-auto-output' for AUTOOUTPUT making hierarchy outputs `verilog-auto-output-every' for AUTOOUTPUTEVERY making all outputs `verilog-auto-reg' for AUTOREG registers @@ -11402,10 +12248,13 @@ (verilog-save-no-change-functions (verilog-save-scan-cache (save-excursion + ;; Wipe cache; otherwise if we AUTOed a block above this one, + ;; we'll misremember we have generated IOs, confusing AUTOOUTPUT + (setq verilog-modi-cache-list nil) ;; If we're not in verilog-mode, change syntax table so parsing works right (unless (eq major-mode `verilog-mode) (verilog-mode)) ;; Allow user to customize - (run-hooks 'verilog-before-auto-hook) + (verilog-run-hooks 'verilog-before-auto-hook) ;; Try to save the user from needing to revert-file to reread file local-variables (verilog-auto-reeval-locals) (verilog-read-auto-lisp-present) @@ -11445,6 +12294,7 @@ ;; first in/outs from other files (verilog-auto-re-search-do "/\\*AUTOINOUTMODULE([^)]*)\\*/" 'verilog-auto-inout-module) (verilog-auto-re-search-do "/\\*AUTOINOUTCOMP([^)]*)\\*/" 'verilog-auto-inout-comp) + (verilog-auto-re-search-do "/\\*AUTOINOUTIN([^)]*)\\*/" 'verilog-auto-inout-in) ;; next in/outs which need previous sucked inputs first (verilog-auto-re-search-do "/\\*AUTOOUTPUT\\((\"[^\"]*\")\\)\\*/" (lambda () (verilog-auto-output t))) @@ -11458,6 +12308,7 @@ ;; Then tie off those in/outs (verilog-auto-re-search-do "/\\*AUTOTIEOFF\\*/" 'verilog-auto-tieoff) ;; Wires/regs must be after inputs/outputs + (verilog-auto-re-search-do "/\\*AUTOLOGIC\\*/" 'verilog-auto-logic) (verilog-auto-re-search-do "/\\*AUTOWIRE\\*/" 'verilog-auto-wire) (verilog-auto-re-search-do "/\\*AUTOREG\\*/" 'verilog-auto-reg) (verilog-auto-re-search-do "/\\*AUTOREGINPUT\\*/" 'verilog-auto-reg-input) @@ -11471,7 +12322,10 @@ (when verilog-auto-inst-template-numbers (verilog-auto-templated-rel)))) ;; - (run-hooks 'verilog-auto-hook) + (verilog-run-hooks 'verilog-auto-hook) + ;; + (when verilog-auto-delete-trailing-whitespace + (verilog-delete-trailing-whitespace)) ;; (set (make-local-variable 'verilog-auto-update-tick) (buffer-chars-modified-tick)) ;; @@ -11502,10 +12356,12 @@ (define-key map "i" 'verilog-sk-initial) (define-key map "j" 'verilog-sk-fork) (define-key map "m" 'verilog-sk-module) + (define-key map "o" 'verilog-sk-ovm-class) (define-key map "p" 'verilog-sk-primitive) (define-key map "r" 'verilog-sk-repeat) (define-key map "s" 'verilog-sk-specify) (define-key map "t" 'verilog-sk-task) + (define-key map "u" 'verilog-sk-uvm-class) (define-key map "w" 'verilog-sk-while) (define-key map "x" 'verilog-sk-casex) (define-key map "z" 'verilog-sk-casez) @@ -11531,7 +12387,7 @@ ;; may want to consider moving the binding to another key in your .emacs ;; file. ;; -;(define-key verilog-mode-map "\C-ct" verilog-template-map) +;; Note \C-c and letter are reserved for users (define-key verilog-mode-map "\C-c\C-t" verilog-template-map) ;;; ---- statement skeletons ------------------------------------------ @@ -11571,7 +12427,7 @@ "output: " str) (define-skeleton verilog-sk-prompt-msb - "Prompt for least significant bit specification." + "Prompt for most significant bit specification." "msb:" str & ?: & '(verilog-sk-prompt-lsb) | -1 ) (define-skeleton verilog-sk-prompt-lsb @@ -11616,6 +12472,38 @@ > _ \n > (- verilog-indent-level-behavioral) "endmodule" (progn (electric-verilog-terminate-line) nil)) +;;; ------------------------------------------------------------------------ +;;; Define a default OVM class, with macros and new() +;;; ------------------------------------------------------------------------ + +(define-skeleton verilog-sk-ovm-class + "Insert a class definition" + () + > "class " (setq name (skeleton-read "Name: ")) " extends " (skeleton-read "Extends: ") ";" \n + > _ \n + > "`ovm_object_utils_begin(" name ")" \n + > (- verilog-indent-level) " `ovm_object_utils_end" \n + > _ \n + > "function new(name=\"" name "\");" \n + > "super.new(name);" \n + > (- verilog-indent-level) "endfunction" \n + > _ \n + > "endclass" (progn (electric-verilog-terminate-line) nil)) + +(define-skeleton verilog-sk-uvm-class + "Insert a class definition" + () + > "class " (setq name (skeleton-read "Name: ")) " extends " (skeleton-read "Extends: ") ";" \n + > _ \n + > "`uvm_object_utils_begin(" name ")" \n + > (- verilog-indent-level) " `uvm_object_utils_end" \n + > _ \n + > "function new(name=\"" name "\");" \n + > "super.new(name);" \n + > (- verilog-indent-level) "endfunction" \n + > _ \n + > "endclass" (progn (electric-verilog-terminate-line) nil)) + (define-skeleton verilog-sk-primitive "Insert a task definition." () @@ -11918,10 +12806,10 @@ ;; This scanner is syntax-fragile, so don't get bent (when verilog-highlight-modules (condition-case nil - (while (verilog-re-search-forward "\\(/\\*AUTOINST\\*/\\|\\.\\*\\)" end-point t) + (while (verilog-re-search-forward-quick "\\(/\\*AUTOINST\\*/\\|\\.\\*\\)" end-point t) (save-excursion (goto-char (match-beginning 0)) - (unless (verilog-inside-comment-p) + (unless (verilog-inside-comment-or-string-p) (verilog-read-inst-module-matcher) ;; sets match 0 (let* ((ov (make-overlay (match-beginning 0) (match-end 0)))) (overlay-put ov 'start-closed 't) ------------------------------------------------------------ revno: 106562 tags: EMACS_PRETEST_24_0_92 committer: Chong Yidong branch nick: trunk timestamp: Thu 2011-12-01 01:38:41 +0800 message: Regenerate ldefs-boot.el diff: === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2011-11-30 16:23:05 +0000 +++ lisp/ldefs-boot.el 2011-11-30 17:38:41 +0000 @@ -13833,7 +13833,7 @@ ;;;*** ;;;### (autoloads (htmlfontify-copy-and-link-dir htmlfontify-buffer) -;;;;;; "htmlfontify" "htmlfontify.el" (20168 40835)) +;;;;;; "htmlfontify" "htmlfontify.el" (20182 26031)) ;;; Generated autoloads from htmlfontify.el (autoload 'htmlfontify-buffer "htmlfontify" "\ @@ -28373,7 +28373,7 @@ ;;;*** ;;;### (autoloads (texi2info texinfo-format-region texinfo-format-buffer) -;;;;;; "texinfmt" "textmodes/texinfmt.el" (20166 6221)) +;;;;;; "texinfmt" "textmodes/texinfmt.el" (20182 26031)) ;;; Generated autoloads from textmodes/texinfmt.el (autoload 'texinfo-format-buffer "texinfmt" "\ @@ -33417,7 +33417,7 @@ ;;;;;; "vc/ediff-vers.el" "vc/ediff-wind.el" "vc/pcvs-info.el" "vc/pcvs-parse.el" ;;;;;; "vc/pcvs-util.el" "vc/vc-dav.el" "vcursor.el" "vt-control.el" ;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (20182 -;;;;;; 21665 750715)) +;;;;;; 26193 488074)) ;;;*** ------------------------------------------------------------ revno: 106561 fixes bug(s): http://debbugs.gnu.org/10164 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2011-11-30 18:50:38 +0200 message: REALLY fix bug #10164 with crashes when linum-mode is turned on. src/dispnew.c (adjust_glyph_matrix): Remove the assertion that verifies glyph row's hash code--we have just reallocated the glyphs, so their contents can be complete garbage. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-30 16:33:05 +0000 +++ src/ChangeLog 2011-11-30 16:50:38 +0000 @@ -1,3 +1,9 @@ +2011-11-30 Eli Zaretskii + + * dispnew.c (adjust_glyph_matrix): Remove the assertion that + verifies glyph row's hash code--we have just reallocated the + glyphs, so their contents can be complete garbage. (Bug#10164) + 2011-11-30 Juanma Barranquero * dispnew.c (adjust_glyph_matrix) [XASSERTS]: Add missing check. === modified file 'src/dispnew.c' --- src/dispnew.c 2011-11-30 12:58:42 +0000 +++ src/dispnew.c 2011-11-30 16:50:38 +0000 @@ -608,10 +608,6 @@ row->glyphs[LAST_AREA] = row->glyphs[LEFT_MARGIN_AREA] + dim.width; } -#if XASSERTS - if (row->enabled_p && !row->mode_line_p) - xassert (verify_row_hash (row)); -#endif ++row; } } ------------------------------------------------------------ revno: 106560 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-11-30 17:33:05 +0100 message: Fix typos. diff: === modified file 'leim/quail/cyrillic.el' --- leim/quail/cyrillic.el 2011-11-19 09:18:31 +0000 +++ leim/quail/cyrillic.el 2011-11-30 16:33:05 +0000 @@ -27,7 +27,7 @@ ;;; Commentary: ;; These methods use a mixture of 8859-5 and Unicode. Quail, used -;; with ucs-tables provides suport for translating on the fly to +;; with ucs-tables provides support for translating on the fly to ;; what's appropriate for aa buffer's file coding system, so the ;; encoding shouldn't matter too much provided it supports the ;; necessary characters. === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-11-30 03:18:33 +0000 +++ lisp/ChangeLog 2011-11-30 16:33:05 +0000 @@ -1,3 +1,9 @@ +2011-11-30 Juanma Barranquero + + * htmlfontify.el (hfy-page-header, hfy-post-html-hooks) + (hfy-shell-file-name, hfy-shell): + * international/fontset.el (x-decompose-font-name): Fix typos. + 2011-11-29 Ken Brown * progmodes/gdb-mi.el: Fix bug#9853, bug#9858, and bug#9878. === modified file 'lisp/htmlfontify.el' --- lisp/htmlfontify.el 2011-11-20 02:29:42 +0000 +++ lisp/htmlfontify.el 2011-11-30 16:33:05 +0000 @@ -150,11 +150,11 @@ :prefix "hfy-") (defcustom hfy-page-header 'hfy-default-header - "Function called to build the header of the html source. + "Function called to build the header of the HTML source. This is called with two arguments (the filename relative to the top level source directory being etag'd and fontified), and a string containing the text to embed in the document. -It should return the string returned will be used as the header for the +It should return a string that will be used as the header for the htmlfontified version of the source file.\n See also `hfy-page-footer'." :group 'htmlfontify @@ -166,8 +166,8 @@ (defcustom hfy-split-index nil "Whether or not to split the index `hfy-index-file' alphabetically. If non-nil, the index is split on the first letter of each tag. -Useful when the index would otherwise -be large and take a long time to render or be difficult to navigate." +Useful when the index would otherwise be large and take +a long time to render or be difficult to navigate." :group 'htmlfontify :tag "split-index" :type '(boolean)) @@ -179,7 +179,7 @@ :tag "page-footer" :type '(function)) -(defcustom hfy-extn ".html" +(defcustom hfy-extn ".html" "File extension used for output files." :group 'htmlfontify :tag "extension" @@ -251,7 +251,7 @@ (defcustom hfy-post-html-hooks nil "List of functions to call after creating and filling the HTML buffer. -These functions will be called with the html buffer as the current buffer." +These functions will be called with the HTML buffer as the current buffer." :group 'htmlfontify :tag "post-html-hooks" :options '(set-auto-mode) @@ -342,7 +342,7 @@ :type '(file)) (defcustom hfy-shell-file-name "/bin/sh" - "Shell (bourne or compatible) to invoke for complex shell operations." + "Shell (Bourne or compatible) to invoke for complex shell operations." :group 'htmlfontify :tag "shell-file-name" :type '(file)) @@ -595,7 +595,8 @@ (setq cperl-syntaxify-by-font-lock t))) (setq hfy-cperl-mode-kludged-p t))) ) -(defun hfy-opt (symbol) "Is option SYMBOL set." +(defun hfy-opt (symbol) + "Is option SYMBOL set." (memq symbol hfy-optimisations)) (defun hfy-default-header (file style) @@ -1066,7 +1067,7 @@ ;; text-decoration is not inherited. ;; but it's not wrong and if this ever changes it will ;; be needed, so I think it's better to leave it in? -- v - (nconc final-style '(("text-decoration"."none")))))) + (nconc final-style '(("text-decoration" . "none")))))) final-style)) ;; strip redundant bits from a name. Technically, this could result in @@ -1992,7 +1993,7 @@ tags-list) ))) (defun hfy-shell () - "Return `shell-file-name', or \"/bin/sh\" if it is a non-bourne shell." + "Return `shell-file-name', or \"/bin/sh\" if it is a non-Bourne shell." (if (string-match "\\\\|\\\\|\\" shell-file-name) shell-file-name (or hfy-shell-file-name "/bin/sh"))) === modified file 'lisp/international/fontset.el' --- lisp/international/fontset.el 2011-11-17 09:09:20 +0000 +++ lisp/international/fontset.el 2011-11-30 16:33:05 +0000 @@ -858,9 +858,9 @@ (defun x-decompose-font-name (pattern) "Decompose PATTERN into XLFD fields and return a vector of the fields. The length of the vector is 12. -The FOUNDRY and FAMILY fields are concatinated and stored in the first +The FOUNDRY and FAMILY fields are concatenated and stored in the first element of the vector. -The REGISTRY and ENCODING fields are concatinated and stored in the last +The REGISTRY and ENCODING fields are concatenated and stored in the last element of the vector. Return nil if PATTERN doesn't conform to XLFD." === modified file 'lisp/textmodes/texinfmt.el' --- lisp/textmodes/texinfmt.el 2011-11-17 09:09:20 +0000 +++ lisp/textmodes/texinfmt.el 2011-11-30 16:33:05 +0000 @@ -518,7 +518,7 @@ ;;; Handle paragraph filling -;; Keep as concatinated lists for ease of maintenance +;; Keep as concatenated lists for ease of maintenance (defvar texinfo-no-refill-regexp (concat === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-30 12:58:42 +0000 +++ src/ChangeLog 2011-11-30 16:33:05 +0000 @@ -8688,7 +8688,7 @@ (xg_set_widget_bg): New function. (delete_cb): New function. (xg_create_frame_widgets): Connect delete-event to delete_cb. - Call xg_set_widget_bg. Only set backgrund pixmap for ! HAVE_GTK3 + Call xg_set_widget_bg. Only set background pixmap for ! HAVE_GTK3 (xg_set_background_color): Call xg_set_widget_bg. (xg_set_frame_icon): Call xg_get_pixbuf_from_pix_and_mask. (xg_create_scroll_bar): vadj is a GtkAdjustment for HAVE_GTK3. === modified file 'src/ftfont.c' --- src/ftfont.c 2011-11-20 02:29:42 +0000 +++ src/ftfont.c 2011-11-30 16:33:05 +0000 @@ -1462,7 +1462,7 @@ : ft_face->glyph->bitmap.pixel_mode == FT_PIXEL_MODE_LCD_V ? 8 : -1); if (bitmap->bits_per_pixel < 0) - /* We don't suport that kind of pixel mode. */ + /* We don't support that kind of pixel mode. */ return -1; bitmap->rows = ft_face->glyph->bitmap.rows; bitmap->width = ft_face->glyph->bitmap.width; === modified file 'src/term.c' --- src/term.c 2011-09-15 16:22:58 +0000 +++ src/term.c 2011-11-30 16:33:05 +0000 @@ -3236,7 +3236,7 @@ MultiLeft (tty) = tgetstr ("LE", address); MultiRight (tty) = tgetstr ("RI", address); - /* SVr4/ANSI color suppert. If "op" isn't available, don't support + /* SVr4/ANSI color support. If "op" isn't available, don't support color because we can't switch back to the default foreground and background. */ tty->TS_orig_pair = tgetstr ("op", address); ------------------------------------------------------------ revno: 106559 committer: Chong Yidong branch nick: trunk timestamp: Thu 2011-12-01 00:23:05 +0800 message: Bump version to 24.0.92. Regenerate AUTHORS and ldefs-boot.el. diff: === modified file 'README' --- README 2011-10-31 02:25:01 +0000 +++ README 2011-11-30 16:23:05 +0000 @@ -2,7 +2,7 @@ See the end of the file for license conditions. -This directory tree holds version 24.0.91 of GNU Emacs, the extensible, +This directory tree holds version 24.0.92 of GNU Emacs, the extensible, customizable, self-documenting real-time display editor. The file INSTALL in this directory says how to build and install GNU === modified file 'configure.in' --- configure.in 2011-11-27 18:33:17 +0000 +++ configure.in 2011-11-30 16:23:05 +0000 @@ -22,7 +22,7 @@ dnl along with GNU Emacs. If not, see . AC_PREREQ(2.65) -AC_INIT(emacs, 24.0.91) +AC_INIT(emacs, 24.0.92) AC_CONFIG_HEADER(src/config.h:src/config.in) AC_CONFIG_SRCDIR(src/lisp.h) AC_CONFIG_AUX_DIR(build-aux) === modified file 'doc/emacs/emacsver.texi' --- doc/emacs/emacsver.texi 2011-10-31 02:25:01 +0000 +++ doc/emacs/emacsver.texi 2011-11-30 16:23:05 +0000 @@ -1,4 +1,4 @@ @c It would be nicer to generate this using configure and @version@. @c However, that would mean emacsver.texi would always be newer @c then the info files in release tarfiles. -@set EMACSVER 24.0.91 +@set EMACSVER 24.0.92 === modified file 'doc/man/emacs.1' --- doc/man/emacs.1 2011-10-31 02:25:01 +0000 +++ doc/man/emacs.1 2011-11-30 16:23:05 +0000 @@ -1,5 +1,5 @@ .\" See section COPYING for copyright and redistribution information. -.TH EMACS 1 "2007 April 13" "GNU Emacs 24.0.91" +.TH EMACS 1 "2007 April 13" "GNU Emacs 24.0.92" . . .SH NAME === modified file 'etc/AUTHORS' --- etc/AUTHORS 2011-11-14 06:27:12 +0000 +++ etc/AUTHORS 2011-11-30 16:23:05 +0000 @@ -31,6 +31,8 @@ reverse-smile.xpm sad.xpm smile.xpm wry.xpm xterm.c gnus-html.el gnus-start.el gnus-sum.el gnus.el gtkutil.c shr.el xterm.h +Adam W: changed mail-source.el + Aditya Siram: changed ob.el Adrian Aichner: changed erc-log.el erc.el erc-autojoin.el erc-backend.el @@ -193,9 +195,9 @@ Andreas Rottmann: changed emacsclient.1 emacsclient.c misc.texi server.el Andreas Schwab: changed Makefile.in configure.in lisp.h xdisp.c alloc.c - process.c coding.c files.el xterm.c editfns.c fns.c keyboard.c print.c + process.c coding.c files.el xterm.c editfns.c keyboard.c fns.c print.c emacs.c eval.c fileio.c lread.c sysdep.c dired.el xfns.c buffer.c - and 568 other files + and 571 other files Andreas Seltenreich: changed nnweb.el gnus.texi message.el gnus-sum.el gnus.el nnslashdot.el gnus-srvr.el gnus-util.el mm-url.el mm-uu.el @@ -497,8 +499,8 @@ and co-wrote longlines.el tango-dark-theme.el tango-theme.el and changed xdisp.c simple.el files.el display.texi frames.texi cus-edit.el files.texi keyboard.c startup.el package.el custom.el - emacs.texi xterm.c subr.el faces.el image.c mouse.el misc.texi - text.texi progmodes/compile.el xfns.c and 826 other files + emacs.texi xterm.c subr.el text.texi faces.el image.c mouse.el + misc.texi progmodes/compile.el xfns.c and 830 other files Chris Chase: co-wrote idlw-shell.el idlwave.el @@ -561,10 +563,11 @@ Christoph Conrad: changed gnus-agent.el gnus-score.el makefile.w32-in qp.el -Christoph Scholtes: changed makefile.w32-in progmodes/python.el INSTALL - README.W32 maintaining.texi zipdist.bat admin.el bookmark.el - configure.bat cua-base.el help-mode.el help.el ido.el makedist.bat - menu.c minibuf.c process.c progmodes/grep.el stdint.h vc.el window.c +Christoph Scholtes: changed makefile.w32-in progmodes/python.el stdint.h + INSTALL README.W32 maintaining.texi zipdist.bat admin.el bookmark.el + config.nt configure.bat control.texi cua-base.el help-mode.el help.el + ido.el makedist.bat menu.c minibuf.c process.c progmodes/grep.el + and 3 other files Christoph Wedler: wrote antlr-mode.el and changed format.el gnus-art.el gnus-picon.el message.el register.el @@ -759,9 +762,11 @@ mml2015.el nnfolder.el nnimap.el nnml.el David Engster: wrote mairix.el nnmairix.el -and changed gnus.texi registry.el gnus-msg.el bovine-grammar.el - display.texi files.el gnus-registry.el gnus-sum.el hideshow.el - mairix-el.texi mm-view.el mml-smime.el nnimap.el +and changed gnus.texi registry.el gnus-msg.el insert.el + analyze/complete.el base.el bovine-grammar.el cedet/srecode.el + cpp-root.el custom.el db-find.el db-typecache.el db.el dictionary.el + display.texi document.el ede-grammar.el files.el generic.el + gnus-registry.el gnus-sum.el and 21 other files David Gillespie: wrote calc-aent.el calc-alg.el calc-arith.el calc-bin.el calc-comb.el calc-cplx.el calc-embed.el calc-ext.el calc-fin.el @@ -908,7 +913,7 @@ Detlev Zundel: wrote re-builder.el -Devon Sean McCullough: changed comint.el +Devon Sean Mccullough: changed comint.el Dhruva Krishnamurthy: changed makefile.w32-in emacsclient.c fontset.c sound.c w32proc.c @@ -940,8 +945,8 @@ Dmitri Paduchikh: changed advice.el Dmitry Antipov: changed alloc.c keyboard.c buffer.c ccl.c editfns.c - emacs.c fontset.c lisp.h lread.c lwlib-Xaw.c lwlib-Xm.c lwlib-utils.c - lwlib.c macmenu.c w32menu.c xlwmenu.c xmenu.c + emacs.c fontset.c keymap.c lisp.h lread.c lwlib-Xaw.c lwlib-Xm.c + lwlib-utils.c lwlib.c macmenu.c w32menu.c xdisp.c xlwmenu.c xmenu.c Dmitry Bolshakov: changed hideshow.el @@ -1018,8 +1023,8 @@ tty-colors.el and changed makefile.w32-in msdos.c xdisp.c Makefile.in files.el config.bat fileio.c msdos.h simple.el mainmake.v2 sed1v2.inp info.el - rmail.el w32.c display.texi process.c pc-win.el startup.el dired.c - dispextern.h emacs.c and 695 other files + display.texi rmail.el w32.c process.c pc-win.el startup.el dispextern.h + dispnew.c dired.c and 697 other files Elias Oltmanns: changed tls.el gnus-agent.el gnus-int.el gnus-srvr.el gnus.el @@ -1162,7 +1167,8 @@ Fabrice Bauzac: changed dired-aux.el -Fabrice Popineau: changed etags.c fileio.c gnus-cache.el +Fabrice Popineau: changed config.nt etags.c fileio.c gnus-cache.el + inttypes.h lisp.h ms-w32.h nmake.defs regex.c stdint.h w32.c Fan Kai: changed esh-arg.el @@ -1320,8 +1326,8 @@ Glenn Morris: wrote check-declare.el f90.el vc-bzr.el and changed Makefile.in configure.in calendar.el diary-lib.el rmail.el files.el cal-menu.el appt.el cal-hebrew.el fortran.el bytecomp.el - holidays.el make-dist calendar.texi emacs.texi sed1v2.inp simple.el - cal-islam.el cal-bahai.el startup.el ack.texi and 1202 other files + holidays.el make-dist calendar.texi emacs.texi simple.el sed1v2.inp + cal-islam.el cal-bahai.el startup.el ack.texi and 1208 other files Glynn Clements: wrote gamegrid.el snake.el tetris.el @@ -1552,7 +1558,7 @@ and changed gtkutil.c xterm.c xfns.c configure.in xmenu.c xterm.h gtkutil.h x-win.el keyboard.c Makefile.in nsterm.m frames.texi xsettings.c frame.c emacs.c xselect.c process.c xlwmenu.c config.in - cus-start.el xresources.texi and 302 other files + cus-start.el nsfns.m and 302 other files Jan Moringen: co-wrote srecode/cpp.el tango-dark-theme.el tango-theme.el and changed dbus.el dbus.texi dbusbind.c eieio.el log-edit.el zeroconf.el @@ -1734,10 +1740,10 @@ Joev Dubach: changed nntp.el Johan Bockgård: changed erc.el cl-macs.el erc-backend.el erc-button.el - erc-match.el browse-url.el bytecomp.el custom.el display.texi + erc-match.el xdisp.c browse-url.el bytecomp.el custom.el display.texi erc-compat.el erc-nickserv.el erc-ring.el erc-speak.el erc-track.el - help-fns.el icomplete.el mouse-sel.el simple.el subr.el xdisp.c - xterm.el and 48 other files + help-fns.el icomplete.el mouse-sel.el simple.el subr.el xterm.el + and 48 other files Johan Euphrosine: changed ibuf-ext.el @@ -1863,8 +1869,8 @@ Juanma Barranquero: wrote emacs-lock.el and changed makefile.w32-in subr.el w32fns.c files.el server.el bs.el emacsclient.c help-fns.el faces.el org.el simple.el buffer.c xdisp.c - keyboard.c process.c w32term.c desktop.el ido.el eval.c mule-cmds.el - w32.c and 1036 other files + keyboard.c process.c w32term.c window.c desktop.el ido.el allout.el + eval.c and 1084 other files Juergen Kreileder: changed imap.el nnimap.el @@ -1895,7 +1901,7 @@ dired-aux.el progmodes/compile.el dired.el startup.el faces.el files.el display.texi menu-bar.el descr-text.el bindings.el cus-edit.el image-mode.el ispell.el man.el dired-x.el log-view.el - and 334 other files + and 335 other files Justin Bogner: changed fortune.el @@ -2001,7 +2007,7 @@ Keith Packard: changed font.c Ken Brown: changed configure.in cygwin.h sheap.c browse-url.el gmalloc.c - vm-limit.c dired.c emacs.c loadup.el mem-limits.h unexcw.c + vm-limit.c dired.c emacs.c gdb-mi.el loadup.el mem-limits.h unexcw.c Ken Brush: changed emacsclient.c @@ -2169,7 +2175,8 @@ and changed gnus.texi gnus-cite.el pop3.el gnus-xmas.el smtpmail.el proto-stream.el auth-source.el xml.c dired.el editfns.c nnultimate.el subr.el gnus-nocem.el gnutls.c imap.el nnkiboze.el nnrss.el - nnslashdot.el spam-report.el gnus-cus.el simple.el and 205 other files + nnslashdot.el spam-report.el url-http.el gnus-cus.el + and 206 other files Lars Rasmusson: changed ebrowse.c @@ -2323,7 +2330,7 @@ Mark Lambert: changed process.c process.h -Mark Lillibridge: changed mail-utils.el rmail.el +Mark Lillibridge: changed rmail.el mail-utils.el unrmail.el Mark Mitchell: changed font-lock.el @@ -2390,7 +2397,7 @@ Martin Pohlack: changed iimage.el pc-select.el Martin Rudalics: changed window.el window.c windows.texi frame.c buffer.c - frame.el help.el cus-edit.el cus-start.el files.el window.h + help.el window.h cus-start.el frame.el cus-edit.el files.el buffers.texi dired.el subr.el add-log.el xdisp.c font-lock.el help-fns.el lisp.h mouse.el wid-edit.el and 135 other files @@ -2479,7 +2486,7 @@ ange-ftp.el tramp-fish.el files.el tramp-imap.el files.texi Makefile.in tramp-vc.el tramp-util.el tramp-uu.el simple.el auth-source.el dired-aux.el configure.in em-unix.el fileio.c keyboard.c - and 64 other files + and 65 other files Michael Ben-Gershon: changed acorn.h configure.in riscix1-1.h riscix1-2.h unexec.c @@ -2581,6 +2588,8 @@ Mike Haertel: changed 7300.h +Mike Kazantsev: changed erc-dcc.el + Mike Kupfer: changed mh-e.el mh-utils.el Mike Long: changed b2m.c make-dist make-mode.el netbsd.h view.el vms.h @@ -2804,9 +2813,9 @@ Paul Eggert: wrote rcs2log vcdiff and co-wrote cal-dst.el and changed lisp.h Makefile.in editfns.c alloc.c xdisp.c configure.in - image.c fileio.c process.c fns.c xterm.c keyboard.c data.c dispextern.h + fileio.c image.c process.c fns.c xterm.c dispextern.h keyboard.c data.c lread.c sysdep.c xfns.c eval.c emacs.c config.in print.c - and 563 other files + and 564 other files Paul Fisher: changed fns.c @@ -3356,9 +3365,9 @@ pcvs-util.el reveal.el smerge-mode.el smie.el vc-mtn.el and co-wrote font-lock.el and changed vc.el subr.el simple.el lisp.h keyboard.c files.el - Makefile.in bytecomp.el keymap.c xdisp.c pcvs.el alloc.c - progmodes/compile.el newcomment.el vc-hooks.el tex-mode.el buffer.c - sh-script.el eval.c fileio.c fill.el and 1030 other files + bytecomp.el Makefile.in keymap.c progmodes/compile.el xdisp.c pcvs.el + alloc.c newcomment.el vc-hooks.el tex-mode.el buffer.c fileio.c + sh-script.el eval.c fill.el and 1032 other files Stefan Reichör: changed gnus-agent.el @@ -3508,7 +3517,7 @@ gnus-art.el gnus.texi nnimap.el files.el gnus-sum.el info.el org-footnote.el org.el reftex-ref.el simple.el tsdh-dark-theme.el tsdh-light-theme.el ack.texi bindings.el bookmark.el cc-mode.el - and 21 other files + and 22 other files Tatsuya Ichikawa: changed gnus-agent.el gnus-cache.el @@ -3520,10 +3529,10 @@ Teodor Zlatanov: wrote auth-source.el gnus-registry.el gnus-sync.el gnus-tests.el gnutls.el registry.el spam-report.el url-future.el -and changed spam.el gnus.el nnimap.el gnus.texi gnus-sum.el auth.texi - gnus-util.el netrc.el gnus-start.el gnutls.c message.el spam-stat.el - encrypt.el nnmail.el imap.el mail-source.el Makefile.in gnus-encrypt.el - gnus-html.el gnus-int.el gnutls.h and 97 other files +and changed spam.el gnus.el nnimap.el gnus.texi gnus-sum.el gnus-util.el + auth.texi netrc.el gnus-start.el gnutls.c message.el spam-stat.el + encrypt.el nnir.el nnmail.el imap.el mail-source.el nnmairix.el + Makefile.in gnus-encrypt.el gnus-html.el and 97 other files Terje Rosten: changed xfns.c version.el xterm.c xterm.h @@ -3839,8 +3848,8 @@ Yann Hodique: changed rcirc.el -Yavor Doganov: changed configure.in Info-gnustep.plist emacs.1 etags.1 - make-dist nsfont.m +Yavor Doganov: changed configure.in Info-gnustep.plist Makefile.in + emacs.1 etags.1 make-dist nsfont.m Yoichi Nakayama: changed browse-url.el finder.el man.el rfc2368.el === modified file 'lisp/ldefs-boot.el' --- lisp/ldefs-boot.el 2011-11-27 18:17:40 +0000 +++ lisp/ldefs-boot.el 2011-11-30 16:23:05 +0000 @@ -5,7 +5,7 @@ ;;;### (autoloads (5x5-crack 5x5-crack-xor-mutate 5x5-crack-mutating-best ;;;;;; 5x5-crack-mutating-current 5x5-crack-randomly 5x5) "5x5" -;;;;;; "play/5x5.el" (20119 34052)) +;;;;;; "play/5x5.el" (20168 40835)) ;;; Generated autoloads from play/5x5.el (autoload '5x5 "5x5" "\ @@ -68,7 +68,7 @@ ;;;*** ;;;### (autoloads (ada-mode ada-add-extensions) "ada-mode" "progmodes/ada-mode.el" -;;;;;; (20119 34052)) +;;;;;; (20177 52156)) ;;; Generated autoloads from progmodes/ada-mode.el (autoload 'ada-add-extensions "ada-mode" "\ @@ -99,7 +99,7 @@ ;;;*** ;;;### (autoloads (ada-find-file) "ada-xref" "progmodes/ada-xref.el" -;;;;;; (20140 44371)) +;;;;;; (20177 52156)) ;;; Generated autoloads from progmodes/ada-xref.el (autoload 'ada-find-file "ada-xref" "\ @@ -253,7 +253,7 @@ ;;;### (autoloads (defadvice ad-activate ad-add-advice ad-disable-advice ;;;;;; ad-enable-advice ad-default-compilation-action ad-redefinition-action) -;;;;;; "advice" "emacs-lisp/advice.el" (20119 34052)) +;;;;;; "advice" "emacs-lisp/advice.el" (20179 5306)) ;;; Generated autoloads from emacs-lisp/advice.el (defvar ad-redefinition-action 'warn "\ @@ -398,7 +398,7 @@ ;;;### (autoloads (align-newline-and-indent align-unhighlight-rule ;;;;;; align-highlight-rule align-current align-entire align-regexp -;;;;;; align) "align" "align.el" (20119 34052)) +;;;;;; align) "align" "align.el" (20181 37901)) ;;; Generated autoloads from align.el (autoload 'align "align" "\ @@ -489,7 +489,7 @@ ;;;### (autoloads (outlineify-sticky allout-mode allout-mode-p allout-auto-activation ;;;;;; allout-setup allout-auto-activation-helper) "allout" "allout.el" -;;;;;; (20126 50779)) +;;;;;; (20177 52156)) ;;; Generated autoloads from allout.el (autoload 'allout-auto-activation-helper "allout" "\ @@ -500,7 +500,7 @@ \(fn VAR VALUE)" nil nil) (autoload 'allout-setup "allout" "\ -Do fundamental emacs session for allout auto-activation. +Do fundamental Emacs session for allout auto-activation. Establishes allout processing as part of visiting a file if `allout-auto-activation' is non-nil, or removes it otherwise. @@ -600,7 +600,7 @@ of special `allout-mode' features and terminology. See also the outline menubar additions for quick reference to many of the features. Customize `allout-auto-activation' to prepare your -emacs session for automatic activation of `allout-mode'. +Emacs session for automatic activation of `allout-mode'. The bindings are those listed in `allout-prefixed-keybindings' and `allout-unprefixed-keybindings'. We recommend customizing @@ -648,7 +648,7 @@ \\[allout-rebullet-current-heading] `allout-rebullet-current-heading' Prompt for alternate bullet for current topic \\[allout-rebullet-topic] `allout-rebullet-topic' Reconcile bullets of topic and - its' offspring -- distinctive bullets are not changed, others + its offspring -- distinctive bullets are not changed, others are alternated according to nesting depth. \\[allout-number-siblings] `allout-number-siblings' Number bullets of topic and siblings -- the offspring are not affected. @@ -658,12 +658,12 @@ ---------------------------------- \\[allout-kill-topic] `allout-kill-topic' Kill current topic, including offspring. \\[allout-copy-topic-as-kill] `allout-copy-topic-as-kill' Copy current topic, including offspring. -\\[allout-kill-line] `allout-kill-line' kill-line, attending to outline structure. +\\[allout-kill-line] `allout-kill-line' Kill line, attending to outline structure. \\[allout-copy-line-as-kill] `allout-copy-line-as-kill' Copy line but don't delete it. \\[allout-yank] `allout-yank' Yank, adjusting depth of yanked topic to depth of heading if yanking into bare topic heading (ie, prefix sans text). -\\[allout-yank-pop] `allout-yank-pop' Is to allout-yank as yank-pop is to yank +\\[allout-yank-pop] `allout-yank-pop' Is to `allout-yank' as `yank-pop' is to `yank'. Topic-oriented Encryption: ------------------------- @@ -806,7 +806,7 @@ When the PREFIX-LEAD is set to the comment-string of a programming language, outline structuring can be embedded in program code without interfering with processing of the text - (by emacs or the language processor) as program code. This + (by Emacs or the language processor) as program code. This setting happens automatically when allout mode is used in programming-mode buffers. See `allout-use-mode-specific-leader' docstring for more detail. @@ -842,7 +842,7 @@ Activate outline mode and establish file var so it is started subsequently. See `allout-layout' and customization of `allout-auto-activation' -for details on preparing emacs for automatic allout activation. +for details on preparing Emacs for automatic allout activation. \(fn &optional ARG)" t nil) @@ -850,7 +850,7 @@ ;;;### (autoloads (allout-widgets-mode allout-widgets-auto-activation ;;;;;; allout-widgets-setup allout-widgets) "allout-widgets" "allout-widgets.el" -;;;;;; (20126 50769)) +;;;;;; (20167 36027)) ;;; Generated autoloads from allout-widgets.el (let ((loads (get 'allout-widgets 'custom-loads))) (if (member '"allout-widgets" loads) nil (put 'allout-widgets 'custom-loads (cons '"allout-widgets" loads)))) @@ -910,7 +910,7 @@ ;;;*** ;;;### (autoloads (ange-ftp-hook-function ange-ftp-reread-dir) "ange-ftp" -;;;;;; "net/ange-ftp.el" (20119 34052)) +;;;;;; "net/ange-ftp.el" (20177 52156)) ;;; Generated autoloads from net/ange-ftp.el (defalias 'ange-ftp-re-read-dir 'ange-ftp-reread-dir) @@ -932,7 +932,7 @@ ;;;*** ;;;### (autoloads (animate-birthday-present animate-sequence animate-string) -;;;;;; "animate" "play/animate.el" (20119 34052)) +;;;;;; "animate" "play/animate.el" (20166 6221)) ;;; Generated autoloads from play/animate.el (autoload 'animate-string "animate" "\ @@ -965,7 +965,7 @@ ;;;*** ;;;### (autoloads (ansi-color-process-output ansi-color-for-comint-mode-on) -;;;;;; "ansi-color" "ansi-color.el" (20119 34052)) +;;;;;; "ansi-color" "ansi-color.el" (20166 6221)) ;;; Generated autoloads from ansi-color.el (autoload 'ansi-color-for-comint-mode-on "ansi-color" "\ @@ -1050,7 +1050,7 @@ ;;;### (autoloads (apropos-documentation apropos-value apropos-library ;;;;;; apropos apropos-documentation-property apropos-command apropos-variable -;;;;;; apropos-read-pattern) "apropos" "apropos.el" (20119 34052)) +;;;;;; apropos-read-pattern) "apropos" "apropos.el" (20161 61915)) ;;; Generated autoloads from apropos.el (autoload 'apropos-read-pattern "apropos" "\ @@ -1120,7 +1120,8 @@ (autoload 'apropos-library "apropos" "\ List the variables and functions defined by library FILE. FILE should be one of the libraries currently loaded and should -thus be found in `load-history'. +thus be found in `load-history'. If `apropos-do-all' is non-nil, +the output includes key-bindings of commands. \(fn FILE)" t nil) @@ -1132,7 +1133,9 @@ search for matches for any two (or more) of those words. With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also looks -at the function and at the names and values of properties. +at function definitions (arguments, documentation and body) and at the +names and values of properties. + Returns list of symbols and values found. \(fn PATTERN &optional DO-ALL)" t nil) @@ -1144,17 +1147,19 @@ search for matches for that word as a substring. If it is a list of words, search for matches for any two (or more) of those words. -With \\[universal-argument] prefix, or if `apropos-do-all' is non-nil, also use -documentation that is not stored in the documentation file and show key -bindings. +Note that by default this command only searches in the file specified by +`internal-doc-file-name'; i.e., the etc/DOC file. With \\[universal-argument] prefix, +or if `apropos-do-all' is non-nil, it searches all currently defined +documentation strings. + Returns list of symbols and documentation found. \(fn PATTERN &optional DO-ALL)" t nil) ;;;*** -;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (archive-mode) "arc-mode" "arc-mode.el" (20166 +;;;;;; 6221)) ;;; Generated autoloads from arc-mode.el (autoload 'archive-mode "arc-mode" "\ @@ -1245,8 +1250,8 @@ ;;;*** -;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (artist-mode) "artist" "textmodes/artist.el" (20173 +;;;;;; 2352)) ;;; Generated autoloads from textmodes/artist.el (autoload 'artist-mode "artist" "\ @@ -1555,7 +1560,7 @@ ;;;*** ;;;### (autoloads (autoconf-mode) "autoconf" "progmodes/autoconf.el" -;;;;;; (20119 34052)) +;;;;;; (20163 7340)) ;;; Generated autoloads from progmodes/autoconf.el (autoload 'autoconf-mode "autoconf" "\ @@ -1606,7 +1611,7 @@ ;;;### (autoloads (batch-update-autoloads update-directory-autoloads ;;;;;; update-file-autoloads) "autoload" "emacs-lisp/autoload.el" -;;;;;; (20119 34052)) +;;;;;; (20173 62431)) ;;; Generated autoloads from emacs-lisp/autoload.el (put 'generated-autoload-file 'safe-local-variable 'stringp) @@ -1657,7 +1662,7 @@ ;;;### (autoloads (global-auto-revert-mode turn-on-auto-revert-tail-mode ;;;;;; auto-revert-tail-mode turn-on-auto-revert-mode auto-revert-mode) -;;;;;; "autorevert" "autorevert.el" (20126 50846)) +;;;;;; "autorevert" "autorevert.el" (20168 40835)) ;;; Generated autoloads from autorevert.el (autoload 'auto-revert-mode "autorevert" "\ @@ -1856,7 +1861,7 @@ ;;;*** ;;;### (autoloads (bibtex-search-entry bibtex-mode bibtex-initialize) -;;;;;; "bibtex" "textmodes/bibtex.el" (20119 34052)) +;;;;;; "bibtex" "textmodes/bibtex.el" (20173 62431)) ;;; Generated autoloads from textmodes/bibtex.el (autoload 'bibtex-initialize "bibtex" "\ @@ -1957,10 +1962,11 @@ ;;;### (autoloads (binhex-decode-region binhex-decode-region-external ;;;;;; binhex-decode-region-internal) "binhex" "mail/binhex.el" -;;;;;; (20119 34052)) +;;;;;; (20175 42237)) ;;; Generated autoloads from mail/binhex.el -(defconst binhex-begin-line "^:...............................................................$") +(defconst binhex-begin-line "^:...............................................................$" "\ +Regular expression matching the start of a BinHex encoded region.") (autoload 'binhex-decode-region-internal "binhex" "\ Binhex decode region between START and END without using an external program. @@ -2104,7 +2110,7 @@ ;;;;;; bookmark-save bookmark-write bookmark-delete bookmark-insert ;;;;;; bookmark-rename bookmark-insert-location bookmark-relocate ;;;;;; bookmark-jump-other-window bookmark-jump bookmark-set) "bookmark" -;;;;;; "bookmark.el" (20119 34052)) +;;;;;; "bookmark.el" (20177 52156)) ;;; Generated autoloads from bookmark.el (define-key ctl-x-r-map "b" 'bookmark-jump) (define-key ctl-x-r-map "m" 'bookmark-set) @@ -2305,7 +2311,7 @@ ;;;;;; browse-url-xdg-open browse-url-at-mouse browse-url-at-point ;;;;;; browse-url browse-url-of-region browse-url-of-dired-file ;;;;;; browse-url-of-buffer browse-url-of-file browse-url-browser-function) -;;;;;; "browse-url" "net/browse-url.el" (20126 51279)) +;;;;;; "browse-url" "net/browse-url.el" (20168 40835)) ;;; Generated autoloads from net/browse-url.el (defvar browse-url-browser-function 'browse-url-default-browser "\ @@ -2618,8 +2624,8 @@ ;;;*** -;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (snarf-bruces bruce) "bruce" "play/bruce.el" (20166 +;;;;;; 6221)) ;;; Generated autoloads from play/bruce.el (autoload 'bruce "bruce" "\ @@ -2635,7 +2641,7 @@ ;;;*** ;;;### (autoloads (bs-show bs-customize bs-cycle-previous bs-cycle-next) -;;;;;; "bs" "bs.el" (20140 44207)) +;;;;;; "bs" "bs.el" (20161 61915)) ;;; Generated autoloads from bs.el (autoload 'bs-cycle-next "bs" "\ @@ -2675,7 +2681,7 @@ ;;;*** -;;;### (autoloads (bubbles) "bubbles" "play/bubbles.el" (20119 34052)) +;;;### (autoloads (bubbles) "bubbles" "play/bubbles.el" (20166 6221)) ;;; Generated autoloads from play/bubbles.el (autoload 'bubbles "bubbles" "\ @@ -2721,7 +2727,7 @@ ;;;;;; batch-byte-compile-if-not-done display-call-tree byte-compile ;;;;;; compile-defun byte-compile-file byte-recompile-directory ;;;;;; byte-force-recompile byte-compile-enable-warning byte-compile-disable-warning) -;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (20119 34052)) +;;;;;; "bytecomp" "emacs-lisp/bytecomp.el" (20177 52156)) ;;; Generated autoloads from emacs-lisp/bytecomp.el (put 'byte-compile-dynamic 'safe-local-variable 'booleanp) (put 'byte-compile-disable-print-circle 'safe-local-variable 'booleanp) @@ -2879,8 +2885,8 @@ ;;;### (autoloads (defmath calc-embedded-activate calc-embedded calc-grab-rectangle ;;;;;; calc-grab-region full-calc-keypad calc-keypad calc-eval quick-calc -;;;;;; full-calc calc calc-dispatch) "calc" "calc/calc.el" (20119 -;;;;;; 34052)) +;;;;;; full-calc calc calc-dispatch) "calc" "calc/calc.el" (20173 +;;;;;; 2352)) ;;; Generated autoloads from calc/calc.el (define-key ctl-x-map "*" 'calc-dispatch) @@ -3097,7 +3103,7 @@ ;;;*** ;;;### (autoloads (c-guess-basic-syntax) "cc-engine" "progmodes/cc-engine.el" -;;;;;; (20139 28158)) +;;;;;; (20173 2352)) ;;; Generated autoloads from progmodes/cc-engine.el (autoload 'c-guess-basic-syntax "cc-engine" "\ @@ -3209,7 +3215,7 @@ ;;;### (autoloads (awk-mode pike-mode idl-mode java-mode objc-mode ;;;;;; c++-mode c-mode c-initialize-cc-mode) "cc-mode" "progmodes/cc-mode.el" -;;;;;; (20138 48832)) +;;;;;; (20168 40835)) ;;; Generated autoloads from progmodes/cc-mode.el (autoload 'c-initialize-cc-mode "cc-mode" "\ @@ -3437,7 +3443,7 @@ ;;;*** -;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (20139 28158)) +;;;### (autoloads nil "cc-vars" "progmodes/cc-vars.el" (20167 36027)) ;;; Generated autoloads from progmodes/cc-vars.el (put 'c-basic-offset 'safe-local-variable 'integerp) (put 'c-backslash-column 'safe-local-variable 'integerp) @@ -3708,7 +3714,7 @@ ;;;*** ;;;### (autoloads (cconv-closure-convert) "cconv" "emacs-lisp/cconv.el" -;;;;;; (20119 34052)) +;;;;;; (20177 52156)) ;;; Generated autoloads from emacs-lisp/cconv.el (autoload 'cconv-closure-convert "cconv" "\ @@ -3723,7 +3729,7 @@ ;;;*** ;;;### (autoloads (cfengine-auto-mode cfengine-mode cfengine3-mode) -;;;;;; "cfengine" "progmodes/cfengine.el" (20119 34052)) +;;;;;; "cfengine" "progmodes/cfengine.el" (20168 40835)) ;;; Generated autoloads from progmodes/cfengine.el (autoload 'cfengine3-mode "cfengine" "\ @@ -3778,7 +3784,7 @@ ;;;;;; checkdoc-comments checkdoc-continue checkdoc-start checkdoc-current-buffer ;;;;;; checkdoc-eval-current-buffer checkdoc-message-interactive ;;;;;; checkdoc-interactive checkdoc checkdoc-list-of-strings-p) -;;;;;; "checkdoc" "emacs-lisp/checkdoc.el" (20127 23374)) +;;;;;; "checkdoc" "emacs-lisp/checkdoc.el" (20168 40835)) ;;; Generated autoloads from emacs-lisp/checkdoc.el (put 'checkdoc-force-docstrings-flag 'safe-local-variable 'booleanp) (put 'checkdoc-force-history-flag 'safe-local-variable 'booleanp) @@ -4067,7 +4073,7 @@ ;;;*** ;;;### (autoloads (common-lisp-indent-function) "cl-indent" "emacs-lisp/cl-indent.el" -;;;;;; (20119 34052)) +;;;;;; (20172 34261)) ;;; Generated autoloads from emacs-lisp/cl-indent.el (autoload 'common-lisp-indent-function "cl-indent" "\ @@ -4187,7 +4193,7 @@ ;;;*** -;;;### (autoloads (color-name-to-rgb) "color" "color.el" (20119 34052)) +;;;### (autoloads (color-name-to-rgb) "color" "color.el" (20175 42237)) ;;; Generated autoloads from color.el (autoload 'color-name-to-rgb "color" "\ @@ -4209,7 +4215,7 @@ ;;;### (autoloads (comint-redirect-results-list-from-process comint-redirect-results-list ;;;;;; comint-redirect-send-command-to-process comint-redirect-send-command ;;;;;; comint-run make-comint make-comint-in-buffer) "comint" "comint.el" -;;;;;; (20135 20784)) +;;;;;; (20169 56777)) ;;; Generated autoloads from comint.el (defvar comint-output-filter-functions '(comint-postoutput-scroll-to-bottom comint-watch-for-password-prompt) "\ @@ -4341,8 +4347,8 @@ ;;;;;; compilation-shell-minor-mode compilation-mode compilation-start ;;;;;; compile compilation-disable-input compile-command compilation-search-path ;;;;;; compilation-ask-about-save compilation-window-height compilation-start-hook -;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (20127 -;;;;;; 25602)) +;;;;;; compilation-mode-hook) "compile" "progmodes/compile.el" (20167 +;;;;;; 36027)) ;;; Generated autoloads from progmodes/compile.el (defvar compilation-mode-hook nil "\ @@ -4544,7 +4550,7 @@ ;;;### (autoloads (conf-xdefaults-mode conf-ppd-mode conf-colon-mode ;;;;;; conf-space-keywords conf-space-mode conf-javaprop-mode conf-windows-mode ;;;;;; conf-unix-mode conf-mode) "conf-mode" "textmodes/conf-mode.el" -;;;;;; (20119 34052)) +;;;;;; (20177 52156)) ;;; Generated autoloads from textmodes/conf-mode.el (autoload 'conf-mode "conf-mode" "\ @@ -4772,7 +4778,7 @@ ;;;*** ;;;### (autoloads (cperl-perldoc-at-point cperl-perldoc cperl-mode) -;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (20119 34052)) +;;;;;; "cperl-mode" "progmodes/cperl-mode.el" (20177 52156)) ;;; Generated autoloads from progmodes/cperl-mode.el (put 'cperl-indent-level 'safe-local-variable 'integerp) (put 'cperl-brace-offset 'safe-local-variable 'integerp) @@ -4990,7 +4996,7 @@ ;;;*** ;;;### (autoloads (crisp-mode crisp-mode) "crisp" "emulation/crisp.el" -;;;;;; (20140 44288)) +;;;;;; (20161 61915)) ;;; Generated autoloads from emulation/crisp.el (defvar crisp-mode nil "\ @@ -5123,7 +5129,7 @@ ;;;;;; customize-mode customize customize-push-and-save customize-save-variable ;;;;;; customize-set-variable customize-set-value custom-menu-sort-alphabetically ;;;;;; custom-buffer-sort-alphabetically custom-browse-sort-alphabetically) -;;;;;; "cus-edit" "cus-edit.el" (20119 34052)) +;;;;;; "cus-edit" "cus-edit.el" (20179 5306)) ;;; Generated autoloads from cus-edit.el (defvar custom-browse-sort-alphabetically nil "\ @@ -5472,7 +5478,7 @@ ;;;*** ;;;### (autoloads (cvs-status-mode) "cvs-status" "vc/cvs-status.el" -;;;;;; (20119 34052)) +;;;;;; (20173 62431)) ;;; Generated autoloads from vc/cvs-status.el (autoload 'cvs-status-mode "cvs-status" "\ @@ -5483,7 +5489,7 @@ ;;;*** ;;;### (autoloads (global-cwarn-mode turn-on-cwarn-mode cwarn-mode) -;;;;;; "cwarn" "progmodes/cwarn.el" (20119 34052)) +;;;;;; "cwarn" "progmodes/cwarn.el" (20168 40835)) ;;; Generated autoloads from progmodes/cwarn.el (autoload 'cwarn-mode "cwarn" "\ @@ -5608,7 +5614,7 @@ ;;;*** ;;;### (autoloads (data-debug-new-buffer) "data-debug" "cedet/data-debug.el" -;;;;;; (20119 34052)) +;;;;;; (20168 40835)) ;;; Generated autoloads from cedet/data-debug.el (autoload 'data-debug-new-buffer "data-debug" "\ @@ -5618,8 +5624,8 @@ ;;;*** -;;;### (autoloads (dbus-handle-event) "dbus" "net/dbus.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (dbus-handle-event) "dbus" "net/dbus.el" (20177 +;;;;;; 52156)) ;;; Generated autoloads from net/dbus.el (autoload 'dbus-handle-event "dbus" "\ @@ -5632,8 +5638,8 @@ ;;;*** -;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (dcl-mode) "dcl-mode" "progmodes/dcl-mode.el" (20163 +;;;;;; 6516)) ;;; Generated autoloads from progmodes/dcl-mode.el (autoload 'dcl-mode "dcl-mode" "\ @@ -5804,7 +5810,7 @@ ;;;*** ;;;### (autoloads (decipher-mode decipher) "decipher" "play/decipher.el" -;;;;;; (20119 34052)) +;;;;;; (20166 6221)) ;;; Generated autoloads from play/decipher.el (autoload 'decipher "decipher" "\ @@ -5833,8 +5839,8 @@ ;;;*** ;;;### (autoloads (delimit-columns-rectangle delimit-columns-region -;;;;;; delimit-columns-customize) "delim-col" "delim-col.el" (20119 -;;;;;; 34052)) +;;;;;; delimit-columns-customize) "delim-col" "delim-col.el" (20154 +;;;;;; 8214)) ;;; Generated autoloads from delim-col.el (autoload 'delimit-columns-customize "delim-col" "\ @@ -5858,8 +5864,8 @@ ;;;*** -;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (delphi-mode) "delphi" "progmodes/delphi.el" (20154 +;;;;;; 8214)) ;;; Generated autoloads from progmodes/delphi.el (autoload 'delphi-mode "delphi" "\ @@ -6008,7 +6014,7 @@ ;;;*** ;;;### (autoloads (describe-char describe-text-properties) "descr-text" -;;;;;; "descr-text.el" (20127 27092)) +;;;;;; "descr-text.el" (20169 56777)) ;;; Generated autoloads from descr-text.el (autoload 'describe-text-properties "descr-text" "\ @@ -6036,7 +6042,7 @@ ;;;### (autoloads (desktop-revert desktop-save-in-desktop-dir desktop-change-dir ;;;;;; desktop-load-default desktop-read desktop-remove desktop-save ;;;;;; desktop-clear desktop-locals-to-save desktop-save-mode) "desktop" -;;;;;; "desktop.el" (20126 50898)) +;;;;;; "desktop.el" (20166 6221)) ;;; Generated autoloads from desktop.el (defvar desktop-save-mode nil "\ @@ -6256,7 +6262,7 @@ ;;;*** ;;;### (autoloads (diary-mode diary-mail-entries diary) "diary-lib" -;;;;;; "calendar/diary-lib.el" (20119 34052)) +;;;;;; "calendar/diary-lib.el" (20168 40835)) ;;; Generated autoloads from calendar/diary-lib.el (autoload 'diary "diary-lib" "\ @@ -6343,7 +6349,7 @@ ;;;*** ;;;### (autoloads (diff-minor-mode diff-mode) "diff-mode" "vc/diff-mode.el" -;;;;;; (20127 23725)) +;;;;;; (20180 63728)) ;;; Generated autoloads from vc/diff-mode.el (autoload 'diff-mode "diff-mode" "\ @@ -6387,7 +6393,7 @@ ;;;*** ;;;### (autoloads (dired-mode dired-noselect dired-other-frame dired-other-window -;;;;;; dired dired-listing-switches) "dired" "dired.el" (20140 44600)) +;;;;;; dired dired-listing-switches) "dired" "dired.el" (20167 36027)) ;;; Generated autoloads from dired.el (defvar dired-listing-switches (purecopy "-al") "\ @@ -6742,8 +6748,8 @@ ;;;*** ;;;### (autoloads (doc-view-bookmark-jump doc-view-minor-mode doc-view-mode-maybe -;;;;;; doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (20139 -;;;;;; 28158)) +;;;;;; doc-view-mode doc-view-mode-p) "doc-view" "doc-view.el" (20173 +;;;;;; 2352)) ;;; Generated autoloads from doc-view.el (autoload 'doc-view-mode-p "doc-view" "\ @@ -6827,7 +6833,7 @@ ;;;### (autoloads (easy-mmode-defsyntax easy-mmode-defmap easy-mmode-define-keymap ;;;;;; define-globalized-minor-mode define-minor-mode) "easy-mmode" -;;;;;; "emacs-lisp/easy-mmode.el" (20136 49226)) +;;;;;; "emacs-lisp/easy-mmode.el" (20179 6242)) ;;; Generated autoloads from emacs-lisp/easy-mmode.el (defalias 'easy-mmode-define-minor-mode 'define-minor-mode) @@ -7093,7 +7099,7 @@ ;;;;;; ebnf-eps-file ebnf-eps-directory ebnf-spool-region ebnf-spool-buffer ;;;;;; ebnf-spool-file ebnf-spool-directory ebnf-print-region ebnf-print-buffer ;;;;;; ebnf-print-file ebnf-print-directory ebnf-customize) "ebnf2ps" -;;;;;; "progmodes/ebnf2ps.el" (20119 34052)) +;;;;;; "progmodes/ebnf2ps.el" (20166 6221)) ;;; Generated autoloads from progmodes/ebnf2ps.el (autoload 'ebnf-customize "ebnf2ps" "\ @@ -7564,7 +7570,7 @@ ;;;*** -;;;### (autoloads (global-ede-mode) "ede" "cedet/ede.el" (20131 35255)) +;;;### (autoloads (global-ede-mode) "ede" "cedet/ede.el" (20168 40835)) ;;; Generated autoloads from cedet/ede.el (defvar global-ede-mode nil "\ @@ -7591,7 +7597,7 @@ ;;;### (autoloads (edebug-all-forms edebug-all-defs edebug-eval-top-level-form ;;;;;; edebug-basic-spec edebug-all-forms edebug-all-defs) "edebug" -;;;;;; "emacs-lisp/edebug.el" (20119 34052)) +;;;;;; "emacs-lisp/edebug.el" (20166 6221)) ;;; Generated autoloads from emacs-lisp/edebug.el (defvar edebug-all-defs nil "\ @@ -7896,7 +7902,7 @@ ;;;*** ;;;### (autoloads (ediff-customize) "ediff-help" "vc/ediff-help.el" -;;;;;; (20119 34052)) +;;;;;; (20177 52156)) ;;; Generated autoloads from vc/ediff-help.el (autoload 'ediff-customize "ediff-help" "\ @@ -7907,7 +7913,7 @@ ;;;*** ;;;### (autoloads (ediff-show-registry) "ediff-mult" "vc/ediff-mult.el" -;;;;;; (20119 34052)) +;;;;;; (20169 56777)) ;;; Generated autoloads from vc/ediff-mult.el (autoload 'ediff-show-registry "ediff-mult" "\ @@ -7920,7 +7926,7 @@ ;;;*** ;;;### (autoloads (ediff-toggle-use-toolbar ediff-toggle-multiframe) -;;;;;; "ediff-util" "vc/ediff-util.el" (20140 44390)) +;;;;;; "ediff-util" "vc/ediff-util.el" (20175 42237)) ;;; Generated autoloads from vc/ediff-util.el (autoload 'ediff-toggle-multiframe "ediff-util" "\ @@ -7990,7 +7996,7 @@ ;;;*** ;;;### (autoloads (edt-emulation-on edt-set-scroll-margins) "edt" -;;;;;; "emulation/edt.el" (20140 44303)) +;;;;;; "emulation/edt.el" (20154 8214)) ;;; Generated autoloads from emulation/edt.el (autoload 'edt-set-scroll-margins "edt" "\ @@ -8045,7 +8051,7 @@ ;;;*** ;;;### (autoloads (turn-on-eldoc-mode eldoc-mode eldoc-minor-mode-string) -;;;;;; "eldoc" "emacs-lisp/eldoc.el" (20127 23532)) +;;;;;; "eldoc" "emacs-lisp/eldoc.el" (20161 61915)) ;;; Generated autoloads from emacs-lisp/eldoc.el (defvar eldoc-minor-mode-string (purecopy " ElDoc") "\ @@ -8092,11 +8098,15 @@ ;;;*** ;;;### (autoloads (electric-layout-mode electric-pair-mode electric-indent-mode) -;;;;;; "electric" "electric.el" (20126 50965)) +;;;;;; "electric" "electric.el" (20168 40835)) ;;; Generated autoloads from electric.el (defvar electric-indent-chars '(10) "\ -Characters that should cause automatic reindentation.") +Characters that should cause automatic reindentation. +Each entry of the list can be either a character or a cons of the +form (CHAR . PREDICATE) which means that CHAR should cause reindentation +only if PREDICATE returns non-nil. PREDICATE is called with no arguments +and with point before the inserted char.") (defvar electric-indent-mode nil "\ Non-nil if Electric-Indent mode is enabled. @@ -8174,7 +8184,7 @@ ;;;### (autoloads (elint-initialize elint-defun elint-current-buffer ;;;;;; elint-directory elint-file) "elint" "emacs-lisp/elint.el" -;;;;;; (20119 34052)) +;;;;;; (20173 2352)) ;;; Generated autoloads from emacs-lisp/elint.el (autoload 'elint-file "elint" "\ @@ -8682,7 +8692,7 @@ ;;;*** -;;;### (autoloads (epg-make-context) "epg" "epg.el" (20119 34052)) +;;;### (autoloads (epg-make-context) "epg" "epg.el" (20173 2352)) ;;; Generated autoloads from epg.el (autoload 'epg-make-context "epg" "\ @@ -8714,7 +8724,7 @@ ;;;*** ;;;### (autoloads (erc-handle-irc-url erc erc-select-read-args) "erc" -;;;;;; "erc/erc.el" (20127 26333)) +;;;;;; "erc/erc.el" (20173 2352)) ;;; Generated autoloads from erc/erc.el (autoload 'erc-select-read-args "erc" "\ @@ -8756,8 +8766,8 @@ ;;;*** -;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (20119 -;;;;;; 34052)) +;;;### (autoloads nil "erc-autoaway" "erc/erc-autoaway.el" (20161 +;;;;;; 61915)) ;;; Generated autoloads from erc/erc-autoaway.el (autoload 'erc-autoaway-mode "erc-autoaway") @@ -8782,7 +8792,7 @@ ;;;*** ;;;### (autoloads (erc-ctcp-query-DCC pcomplete/erc-mode/DCC erc-cmd-DCC) -;;;;;; "erc-dcc" "erc/erc-dcc.el" (20119 34052)) +;;;;;; "erc-dcc" "erc/erc-dcc.el" (20179 27641)) ;;; Generated autoloads from erc/erc-dcc.el (autoload 'erc-dcc-mode "erc-dcc") @@ -8936,7 +8946,7 @@ ;;;*** ;;;### (autoloads (erc-save-buffer-in-logs erc-logging-enabled) "erc-log" -;;;;;; "erc/erc-log.el" (20119 34052)) +;;;;;; "erc/erc-log.el" (20168 40835)) ;;; Generated autoloads from erc/erc-log.el (autoload 'erc-log-mode "erc-log" nil t) @@ -8968,7 +8978,7 @@ ;;;### (autoloads (erc-delete-dangerous-host erc-add-dangerous-host ;;;;;; erc-delete-keyword erc-add-keyword erc-delete-fool erc-add-fool ;;;;;; erc-delete-pal erc-add-pal) "erc-match" "erc/erc-match.el" -;;;;;; (20119 34052)) +;;;;;; (20168 40835)) ;;; Generated autoloads from erc/erc-match.el (autoload 'erc-match-mode "erc-match") @@ -9051,13 +9061,13 @@ ;;;*** ;;;### (autoloads (pcomplete/erc-mode/NOTIFY erc-cmd-NOTIFY) "erc-notify" -;;;;;; "erc/erc-notify.el" (20119 34052)) +;;;;;; "erc/erc-notify.el" (20161 61915)) ;;; Generated autoloads from erc/erc-notify.el (autoload 'erc-notify-mode "erc-notify" nil t) (autoload 'erc-cmd-NOTIFY "erc-notify" "\ Change `erc-notify-list' or list current notify-list members online. -Without args, list the current list of notificated people online, +Without args, list the current list of notified people online, with args, toggle notify status of people. \(fn &rest ARGS)" nil nil) @@ -9144,7 +9154,7 @@ ;;;*** ;;;### (autoloads (erc-track-minor-mode) "erc-track" "erc/erc-track.el" -;;;;;; (20127 26257)) +;;;;;; (20168 40835)) ;;; Generated autoloads from erc/erc-track.el (defvar erc-track-minor-mode nil "\ @@ -9203,7 +9213,7 @@ ;;;### (autoloads (ert-describe-test ert-run-tests-interactively ;;;;;; ert-run-tests-batch-and-exit ert-run-tests-batch ert-deftest) -;;;;;; "ert" "emacs-lisp/ert.el" (20123 28776)) +;;;;;; "ert" "emacs-lisp/ert.el" (20168 40835)) ;;; Generated autoloads from emacs-lisp/ert.el (autoload 'ert-deftest "ert" "\ @@ -9285,8 +9295,8 @@ ;;;*** -;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (eshell-mode) "esh-mode" "eshell/esh-mode.el" (20166 +;;;;;; 6221)) ;;; Generated autoloads from eshell/esh-mode.el (autoload 'eshell-mode "esh-mode" "\ @@ -9340,7 +9350,7 @@ ;;;;;; visit-tags-table tags-table-mode find-tag-default-function ;;;;;; find-tag-hook tags-add-tables tags-compression-info-list ;;;;;; tags-table-list tags-case-fold-search) "etags" "progmodes/etags.el" -;;;;;; (20119 34052)) +;;;;;; (20168 40835)) ;;; Generated autoloads from progmodes/etags.el (defvar tags-file-name nil "\ @@ -9658,7 +9668,7 @@ ;;;;;; ethio-fidel-to-sera-marker ethio-fidel-to-sera-region ethio-fidel-to-sera-buffer ;;;;;; ethio-sera-to-fidel-marker ethio-sera-to-fidel-region ethio-sera-to-fidel-buffer ;;;;;; setup-ethiopic-environment-internal) "ethio-util" "language/ethio-util.el" -;;;;;; (20119 34052)) +;;;;;; (20175 42237)) ;;; Generated autoloads from language/ethio-util.el (autoload 'setup-ethiopic-environment-internal "ethio-util" "\ @@ -9920,7 +9930,7 @@ ;;;*** ;;;### (autoloads (eudc-try-bbdb-insert eudc-insert-record-at-point-into-bbdb) -;;;;;; "eudc-export" "net/eudc-export.el" (20119 34052)) +;;;;;; "eudc-export" "net/eudc-export.el" (20175 42237)) ;;; Generated autoloads from net/eudc-export.el (autoload 'eudc-insert-record-at-point-into-bbdb "eudc-export" "\ @@ -9937,7 +9947,7 @@ ;;;*** ;;;### (autoloads (eudc-edit-hotlist) "eudc-hotlist" "net/eudc-hotlist.el" -;;;;;; (20119 34052)) +;;;;;; (20163 6516)) ;;; Generated autoloads from net/eudc-hotlist.el (autoload 'eudc-edit-hotlist "eudc-hotlist" "\ @@ -9977,7 +9987,7 @@ ;;;### (autoloads (executable-make-buffer-file-executable-if-script-p ;;;;;; executable-self-display executable-set-magic executable-interpret ;;;;;; executable-command-find-posix-p) "executable" "progmodes/executable.el" -;;;;;; (20119 34052)) +;;;;;; (20161 61915)) ;;; Generated autoloads from progmodes/executable.el (autoload 'executable-command-find-posix-p "executable" "\ @@ -10020,18 +10030,18 @@ ;;;### (autoloads (expand-jump-to-next-slot expand-jump-to-previous-slot ;;;;;; expand-abbrev-hook expand-add-abbrevs) "expand" "expand.el" -;;;;;; (20119 34052)) +;;;;;; (20164 31636)) ;;; Generated autoloads from expand.el (autoload 'expand-add-abbrevs "expand" "\ -Add a list of abbrev to abbrev table TABLE. +Add a list of abbreviations to abbrev table TABLE. ABBREVS is a list of abbrev definitions; each abbrev description entry has the form (ABBREV EXPANSION ARG). ABBREV is the abbreviation to replace. EXPANSION is the replacement string or a function which will make the -expansion. For example you, could use the DMacros or skeleton packages +expansion. For example, you could use the DMacros or skeleton packages to generate such functions. ARG is an optional argument which can be a number or a list of @@ -10069,7 +10079,7 @@ ;;;*** -;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (20119 34052)) +;;;### (autoloads (f90-mode) "f90" "progmodes/f90.el" (20177 52156)) ;;; Generated autoloads from progmodes/f90.el (autoload 'f90-mode "f90" "\ @@ -10280,7 +10290,7 @@ ;;;### (autoloads (feedmail-queue-reminder feedmail-run-the-queue ;;;;;; feedmail-run-the-queue-global-prompt feedmail-run-the-queue-no-prompts -;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (20119 34052)) +;;;;;; feedmail-send-it) "feedmail" "mail/feedmail.el" (20173 2352)) ;;; Generated autoloads from mail/feedmail.el (autoload 'feedmail-send-it "feedmail" "\ @@ -10334,7 +10344,7 @@ ;;;*** ;;;### (autoloads (ffap-bindings dired-at-point ffap-at-mouse ffap-menu -;;;;;; find-file-at-point ffap-next) "ffap" "ffap.el" (20119 34052)) +;;;;;; find-file-at-point ffap-next) "ffap" "ffap.el" (20166 6221)) ;;; Generated autoloads from ffap.el (autoload 'ffap-next "ffap" "\ @@ -10458,7 +10468,7 @@ ;;;;;; copy-file-locals-to-dir-locals delete-dir-local-variable ;;;;;; add-dir-local-variable delete-file-local-variable-prop-line ;;;;;; add-file-local-variable-prop-line delete-file-local-variable -;;;;;; add-file-local-variable) "files-x" "files-x.el" (20119 34052)) +;;;;;; add-file-local-variable) "files-x" "files-x.el" (20167 36027)) ;;; Generated autoloads from files-x.el (autoload 'add-file-local-variable "files-x" "\ @@ -10523,8 +10533,8 @@ ;;;*** -;;;### (autoloads (filesets-init) "filesets" "filesets.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (filesets-init) "filesets" "filesets.el" (20177 +;;;;;; 52156)) ;;; Generated autoloads from filesets.el (autoload 'filesets-init "filesets" "\ @@ -10689,7 +10699,7 @@ ;;;;;; find-variable find-variable-noselect find-function-other-frame ;;;;;; find-function-other-window find-function find-function-noselect ;;;;;; find-function-search-for-symbol find-library) "find-func" -;;;;;; "emacs-lisp/find-func.el" (20119 34052)) +;;;;;; "emacs-lisp/find-func.el" (20153 18814)) ;;; Generated autoloads from emacs-lisp/find-func.el (autoload 'find-library "find-func" "\ @@ -10958,14 +10968,14 @@ ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off ;;;;;; turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode) -;;;;;; "flyspell" "textmodes/flyspell.el" (20139 33526)) +;;;;;; "flyspell" "textmodes/flyspell.el" (20175 42237)) ;;; Generated autoloads from textmodes/flyspell.el (autoload 'flyspell-prog-mode "flyspell" "\ Turn on `flyspell-mode' for comments and strings. \(fn)" t nil) -(defvar flyspell-mode nil) +(defvar flyspell-mode nil "Non-nil if Flyspell mode is enabled.") (autoload 'flyspell-mode "flyspell" "\ Toggle on-the-fly spell checking (Flyspell mode). @@ -11030,7 +11040,7 @@ ;;;### (autoloads (follow-delete-other-windows-and-split follow-mode ;;;;;; turn-off-follow-mode turn-on-follow-mode) "follow" "follow.el" -;;;;;; (20140 43930)) +;;;;;; (20177 52156)) ;;; Generated autoloads from follow.el (autoload 'turn-on-follow-mode "follow" "\ @@ -11106,8 +11116,8 @@ ;;;*** -;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (20127 -;;;;;; 26006)) +;;;### (autoloads (footnote-mode) "footnote" "mail/footnote.el" (20169 +;;;;;; 56777)) ;;; Generated autoloads from mail/footnote.el (autoload 'footnote-mode "footnote" "\ @@ -11126,7 +11136,7 @@ ;;;*** ;;;### (autoloads (forms-find-file-other-window forms-find-file forms-mode) -;;;;;; "forms" "forms.el" (20119 34052)) +;;;;;; "forms" "forms.el" (20168 40835)) ;;; Generated autoloads from forms.el (autoload 'forms-mode "forms" "\ @@ -11163,7 +11173,7 @@ ;;;*** ;;;### (autoloads (fortran-mode) "fortran" "progmodes/fortran.el" -;;;;;; (20140 44048)) +;;;;;; (20177 52156)) ;;; Generated autoloads from progmodes/fortran.el (autoload 'fortran-mode "fortran" "\ @@ -11241,7 +11251,7 @@ ;;;*** ;;;### (autoloads (fortune fortune-to-signature fortune-compile fortune-from-region -;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (20119 34052)) +;;;;;; fortune-add-fortune) "fortune" "play/fortune.el" (20166 6221)) ;;; Generated autoloads from play/fortune.el (autoload 'fortune-add-fortune "fortune" "\ @@ -11290,7 +11300,7 @@ ;;;*** ;;;### (autoloads (gdb gdb-enable-debug) "gdb-mi" "progmodes/gdb-mi.el" -;;;;;; (20140 44067)) +;;;;;; (20181 58699)) ;;; Generated autoloads from progmodes/gdb-mi.el (defvar gdb-enable-debug nil "\ @@ -11449,7 +11459,7 @@ ;;;### (autoloads (gmm-tool-bar-from-list gmm-widget-p gmm-error ;;;;;; gmm-message gmm-regexp-concat) "gmm-utils" "gnus/gmm-utils.el" -;;;;;; (20119 34052)) +;;;;;; (20175 42237)) ;;; Generated autoloads from gnus/gmm-utils.el (autoload 'gmm-regexp-concat "gmm-utils" "\ @@ -11504,7 +11514,7 @@ ;;;*** ;;;### (autoloads (gnus gnus-other-frame gnus-slave gnus-no-server -;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (20119 34052)) +;;;;;; gnus-slave-no-server) "gnus" "gnus/gnus.el" (20166 6221)) ;;; Generated autoloads from gnus/gnus.el (when (fboundp 'custom-autoload) (custom-autoload 'gnus-select-method "gnus")) @@ -11557,7 +11567,7 @@ ;;;;;; gnus-agent-get-undownloaded-list gnus-agent-delete-group ;;;;;; gnus-agent-rename-group gnus-agent-possibly-save-gcc gnus-agentize ;;;;;; gnus-slave-unplugged gnus-plugged gnus-unplugged) "gnus-agent" -;;;;;; "gnus/gnus-agent.el" (20119 34052)) +;;;;;; "gnus/gnus-agent.el" (20168 40835)) ;;; Generated autoloads from gnus/gnus-agent.el (autoload 'gnus-unplugged "gnus-agent" "\ @@ -11648,7 +11658,7 @@ ;;;*** ;;;### (autoloads (gnus-article-prepare-display) "gnus-art" "gnus/gnus-art.el" -;;;;;; (20119 34052)) +;;;;;; (20181 58699)) ;;; Generated autoloads from gnus/gnus-art.el (autoload 'gnus-article-prepare-display "gnus-art" "\ @@ -11763,7 +11773,7 @@ ;;;*** ;;;### (autoloads (gnus-user-format-function-D gnus-user-format-function-d) -;;;;;; "gnus-diary" "gnus/gnus-diary.el" (20119 34052)) +;;;;;; "gnus-diary" "gnus/gnus-diary.el" (20161 61915)) ;;; Generated autoloads from gnus/gnus-diary.el (autoload 'gnus-user-format-function-d "gnus-diary" "\ @@ -11779,7 +11789,7 @@ ;;;*** ;;;### (autoloads (turn-on-gnus-dired-mode) "gnus-dired" "gnus/gnus-dired.el" -;;;;;; (20119 34052)) +;;;;;; (20167 36027)) ;;; Generated autoloads from gnus/gnus-dired.el (autoload 'turn-on-gnus-dired-mode "gnus-dired" "\ @@ -11866,7 +11876,7 @@ ;;;*** ;;;### (autoloads (gnus-fetch-group-other-frame gnus-fetch-group) -;;;;;; "gnus-group" "gnus/gnus-group.el" (20119 34052)) +;;;;;; "gnus-group" "gnus/gnus-group.el" (20179 5306)) ;;; Generated autoloads from gnus/gnus-group.el (autoload 'gnus-fetch-group "gnus-group" "\ @@ -12162,7 +12172,7 @@ ;;;*** ;;;### (autoloads (gnus-registry-install-hooks gnus-registry-initialize) -;;;;;; "gnus-registry" "gnus/gnus-registry.el" (20124 52030)) +;;;;;; "gnus-registry" "gnus/gnus-registry.el" (20146 43754)) ;;; Generated autoloads from gnus/gnus-registry.el (autoload 'gnus-registry-initialize "gnus-registry" "\ @@ -12218,7 +12228,7 @@ ;;;*** ;;;### (autoloads (gnus-declare-backend) "gnus-start" "gnus/gnus-start.el" -;;;;;; (20119 34052)) +;;;;;; (20177 52156)) ;;; Generated autoloads from gnus/gnus-start.el (autoload 'gnus-declare-backend "gnus-start" "\ @@ -12229,7 +12239,7 @@ ;;;*** ;;;### (autoloads (gnus-summary-bookmark-jump) "gnus-sum" "gnus/gnus-sum.el" -;;;;;; (20119 34052)) +;;;;;; (20173 2352)) ;;; Generated autoloads from gnus/gnus-sum.el (autoload 'gnus-summary-bookmark-jump "gnus-sum" "\ @@ -12257,7 +12267,7 @@ ;;;*** ;;;### (autoloads (gnus-add-configuration) "gnus-win" "gnus/gnus-win.el" -;;;;;; (20119 34052)) +;;;;;; (20161 61915)) ;;; Generated autoloads from gnus/gnus-win.el (autoload 'gnus-add-configuration "gnus-win" "\ @@ -12268,7 +12278,7 @@ ;;;*** ;;;### (autoloads (gnutls-min-prime-bits) "gnutls" "net/gnutls.el" -;;;;;; (20119 34052)) +;;;;;; (20175 42237)) ;;; Generated autoloads from net/gnutls.el (defvar gnutls-min-prime-bits nil "\ @@ -12284,7 +12294,7 @@ ;;;*** -;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (20119 34052)) +;;;### (autoloads (gomoku) "gomoku" "play/gomoku.el" (20177 52156)) ;;; Generated autoloads from play/gomoku.el (autoload 'gomoku "gomoku" "\ @@ -12369,7 +12379,7 @@ ;;;### (autoloads (zrgrep rgrep lgrep grep-find grep grep-mode grep-compute-defaults ;;;;;; grep-process-setup grep-setup-hook grep-find-command grep-command -;;;;;; grep-window-height) "grep" "progmodes/grep.el" (20119 34052)) +;;;;;; grep-window-height) "grep" "progmodes/grep.el" (20175 42237)) ;;; Generated autoloads from progmodes/grep.el (defvar grep-window-height nil "\ @@ -12427,9 +12437,11 @@ This variable's value takes effect when `grep-compute-defaults' is called.") -(defvar grep-history nil) +(defvar grep-history nil "\ +History list for grep.") -(defvar grep-find-history nil) +(defvar grep-find-history nil "\ +History list for grep-find.") (autoload 'grep-process-setup "grep" "\ Setup compilation variables and buffer for `grep'. @@ -12540,7 +12552,7 @@ ;;;*** ;;;### (autoloads (gud-tooltip-mode gdb-script-mode jdb pdb perldb -;;;;;; xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (20127 25495)) +;;;;;; xdb dbx sdb gud-gdb) "gud" "progmodes/gud.el" (20177 52156)) ;;; Generated autoloads from progmodes/gud.el (autoload 'gud-gdb "gud" "\ @@ -12851,7 +12863,7 @@ ;;;### (autoloads (doc-file-to-info doc-file-to-man describe-categories ;;;;;; describe-syntax describe-variable variable-at-point describe-function-1 ;;;;;; find-lisp-object-file-name help-C-file-name describe-function) -;;;;;; "help-fns" "help-fns.el" (20119 34052)) +;;;;;; "help-fns" "help-fns.el" (20161 61915)) ;;; Generated autoloads from help-fns.el (autoload 'describe-function "help-fns" "\ @@ -12947,8 +12959,8 @@ ;;;### (autoloads (help-xref-on-pp help-insert-xref-button help-xref-button ;;;;;; help-make-xrefs help-buffer help-setup-xref help-mode-finish -;;;;;; help-mode-setup help-mode) "help-mode" "help-mode.el" (20119 -;;;;;; 34052)) +;;;;;; help-mode-setup help-mode) "help-mode" "help-mode.el" (20167 +;;;;;; 36027)) ;;; Generated autoloads from help-mode.el (autoload 'help-mode "help-mode" "\ @@ -13337,7 +13349,7 @@ ;;;*** ;;;### (autoloads (turn-off-hideshow hs-minor-mode) "hideshow" "progmodes/hideshow.el" -;;;;;; (20119 34052)) +;;;;;; (20173 2352)) ;;; Generated autoloads from progmodes/hideshow.el (defvar hs-special-modes-alist (mapcar 'purecopy '((c-mode "{" "}" "/[*/]" nil nil) (c++-mode "{" "}" "/[*/]" nil nil) (bibtex-mode ("@\\S(*\\(\\s(\\)" 1)) (java-mode "{" "}" "/[*/]" nil nil) (js-mode "{" "}" "/[*/]" nil))) "\ @@ -13399,8 +13411,8 @@ ;;;;;; highlight-compare-buffers highlight-changes-rotate-faces ;;;;;; highlight-changes-previous-change highlight-changes-next-change ;;;;;; highlight-changes-remove-highlight highlight-changes-visible-mode -;;;;;; highlight-changes-mode) "hilit-chg" "hilit-chg.el" (20126 -;;;;;; 50110)) +;;;;;; highlight-changes-mode) "hilit-chg" "hilit-chg.el" (20166 +;;;;;; 6221)) ;;; Generated autoloads from hilit-chg.el (autoload 'highlight-changes-mode "hilit-chg" "\ @@ -13535,7 +13547,7 @@ ;;;;;; hippie-expand-ignore-buffers hippie-expand-max-buffers hippie-expand-no-restriction ;;;;;; hippie-expand-dabbrev-as-symbol hippie-expand-dabbrev-skip-space ;;;;;; hippie-expand-verbose hippie-expand-try-functions-list) "hippie-exp" -;;;;;; "hippie-exp.el" (20119 34052)) +;;;;;; "hippie-exp.el" (20167 36027)) ;;; Generated autoloads from hippie-exp.el (defvar hippie-expand-try-functions-list '(try-complete-file-name-partially try-complete-file-name try-expand-all-abbrevs try-expand-list try-expand-line try-expand-dabbrev try-expand-dabbrev-all-buffers try-expand-dabbrev-from-kill try-complete-lisp-symbol-partially try-complete-lisp-symbol) "\ @@ -13809,8 +13821,8 @@ ;;;*** -;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (html2text) "html2text" "gnus/html2text.el" (20166 +;;;;;; 6221)) ;;; Generated autoloads from gnus/html2text.el (autoload 'html2text "html2text" "\ @@ -13821,7 +13833,7 @@ ;;;*** ;;;### (autoloads (htmlfontify-copy-and-link-dir htmlfontify-buffer) -;;;;;; "htmlfontify" "htmlfontify.el" (20119 34052)) +;;;;;; "htmlfontify" "htmlfontify.el" (20168 40835)) ;;; Generated autoloads from htmlfontify.el (autoload 'htmlfontify-buffer "htmlfontify" "\ @@ -13952,7 +13964,7 @@ ;;;*** ;;;### (autoloads (ibuffer ibuffer-other-window ibuffer-list-buffers) -;;;;;; "ibuffer" "ibuffer.el" (20126 50992)) +;;;;;; "ibuffer" "ibuffer.el" (20163 6516)) ;;; Generated autoloads from ibuffer.el (autoload 'ibuffer-list-buffers "ibuffer" "\ @@ -13993,7 +14005,7 @@ ;;;### (autoloads (icalendar-import-buffer icalendar-import-file ;;;;;; icalendar-export-region icalendar-export-file) "icalendar" -;;;;;; "calendar/icalendar.el" (20119 34052)) +;;;;;; "calendar/icalendar.el" (20164 31636)) ;;; Generated autoloads from calendar/icalendar.el (autoload 'icalendar-export-file "icalendar" "\ @@ -14109,7 +14121,7 @@ ;;;*** ;;;### (autoloads (idlwave-shell) "idlw-shell" "progmodes/idlw-shell.el" -;;;;;; (20127 25340)) +;;;;;; (20177 52156)) ;;; Generated autoloads from progmodes/idlw-shell.el (autoload 'idlwave-shell "idlw-shell" "\ @@ -14135,7 +14147,7 @@ ;;;*** ;;;### (autoloads (idlwave-mode) "idlwave" "progmodes/idlwave.el" -;;;;;; (20129 34279)) +;;;;;; (20168 40835)) ;;; Generated autoloads from progmodes/idlwave.el (autoload 'idlwave-mode "idlwave" "\ @@ -14269,8 +14281,8 @@ ;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file ;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer ;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window -;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (20139 -;;;;;; 37519)) +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (20177 +;;;;;; 52156)) ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14756,7 +14768,7 @@ ;;;;;; image-dired-jump-thumbnail-buffer image-dired-delete-tag ;;;;;; image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs ;;;;;; image-dired-dired-with-window-configuration image-dired-dired-toggle-marked-thumbs) -;;;;;; "image-dired" "image-dired.el" (20140 44252)) +;;;;;; "image-dired" "image-dired.el" (20169 56777)) ;;; Generated autoloads from image-dired.el (autoload 'image-dired-dired-toggle-marked-thumbs "image-dired" "\ @@ -14957,7 +14969,7 @@ ;;;*** ;;;### (autoloads (image-bookmark-jump image-mode-as-text image-minor-mode -;;;;;; image-mode) "image-mode" "image-mode.el" (20126 50186)) +;;;;;; image-mode) "image-mode" "image-mode.el" (20161 61915)) ;;; Generated autoloads from image-mode.el (autoload 'image-mode "image-mode" "\ @@ -15151,7 +15163,7 @@ ;;;### (autoloads (inferior-lisp inferior-lisp-prompt inferior-lisp-load-command ;;;;;; inferior-lisp-program inferior-lisp-filter-regexp) "inf-lisp" -;;;;;; "progmodes/inf-lisp.el" (20119 34052)) +;;;;;; "progmodes/inf-lisp.el" (20168 40835)) ;;; Generated autoloads from progmodes/inf-lisp.el (defvar inferior-lisp-filter-regexp (purecopy "\\`\\s *\\(:\\(\\w\\|\\s_\\)\\)?\\s *\\'") "\ @@ -15218,7 +15230,7 @@ ;;;;;; Info-goto-emacs-key-command-node Info-goto-emacs-command-node ;;;;;; Info-mode info-finder info-apropos Info-index Info-directory ;;;;;; Info-on-current-buffer info-standalone info-emacs-manual -;;;;;; info info-other-window) "info" "info.el" (20134 14214)) +;;;;;; info info-other-window) "info" "info.el" (20173 2352)) ;;; Generated autoloads from info.el (autoload 'info-other-window "info" "\ @@ -15453,7 +15465,7 @@ ;;;### (autoloads (info-xref-docstrings info-xref-check-all-custom ;;;;;; info-xref-check-all info-xref-check) "info-xref" "info-xref.el" -;;;;;; (20119 34052)) +;;;;;; (20169 56777)) ;;; Generated autoloads from info-xref.el (autoload 'info-xref-check "info-xref" "\ @@ -15723,7 +15735,7 @@ ;;;;;; ispell-complete-word ispell-continue ispell-buffer ispell-comments-and-strings ;;;;;; ispell-region ispell-change-dictionary ispell-kill-ispell ;;;;;; ispell-help ispell-pdict-save ispell-word ispell-personal-dictionary) -;;;;;; "ispell" "textmodes/ispell.el" (20139 33409)) +;;;;;; "ispell" "textmodes/ispell.el" (20177 52156)) ;;; Generated autoloads from textmodes/ispell.el (put 'ispell-check-comments 'safe-local-variable (lambda (a) (memq a '(nil t exclusive)))) @@ -15949,8 +15961,8 @@ ;;;*** -;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (20126 -;;;;;; 50194)) +;;;### (autoloads (iswitchb-mode) "iswitchb" "iswitchb.el" (20168 +;;;;;; 40835)) ;;; Generated autoloads from iswitchb.el (defvar iswitchb-mode nil "\ @@ -16079,7 +16091,7 @@ ;;;*** -;;;### (autoloads (js-mode) "js" "progmodes/js.el" (20119 34052)) +;;;### (autoloads (js-mode) "js" "progmodes/js.el" (20167 36027)) ;;; Generated autoloads from progmodes/js.el (autoload 'js-mode "js" "\ @@ -16196,7 +16208,7 @@ ;;;### (autoloads (kmacro-end-call-mouse kmacro-end-and-call-macro ;;;;;; kmacro-end-or-call-macro kmacro-start-macro-or-insert-counter ;;;;;; kmacro-call-macro kmacro-end-macro kmacro-start-macro kmacro-exec-ring-item) -;;;;;; "kmacro" "kmacro.el" (20119 34052)) +;;;;;; "kmacro" "kmacro.el" (20166 6221)) ;;; Generated autoloads from kmacro.el (global-set-key "\C-x(" 'kmacro-start-macro) (global-set-key "\C-x)" 'kmacro-end-macro) @@ -16322,7 +16334,7 @@ ;;;*** ;;;### (autoloads (landmark landmark-test-run) "landmark" "play/landmark.el" -;;;;;; (20119 34052)) +;;;;;; (20177 52156)) ;;; Generated autoloads from play/landmark.el (defalias 'landmark-repeat 'landmark-test-run) @@ -16354,7 +16366,7 @@ ;;;### (autoloads (lao-compose-region lao-composition-function lao-transcribe-roman-to-lao-string ;;;;;; lao-transcribe-single-roman-syllable-to-lao lao-compose-string) -;;;;;; "lao-util" "language/lao-util.el" (20119 34052)) +;;;;;; "lao-util" "language/lao-util.el" (20166 6221)) ;;; Generated autoloads from language/lao-util.el (autoload 'lao-compose-string "lao-util" "\ @@ -16572,8 +16584,8 @@ ;;;*** -;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (unload-feature) "loadhist" "loadhist.el" (20169 +;;;;;; 56777)) ;;; Generated autoloads from loadhist.el (autoload 'unload-feature "loadhist" "\ @@ -16722,13 +16734,15 @@ ;;;*** ;;;### (autoloads (print-region lpr-region print-buffer lpr-buffer -;;;;;; lpr-command lpr-switches printer-name) "lpr" "lpr.el" (20119 -;;;;;; 34052)) +;;;;;; lpr-command lpr-switches printer-name) "lpr" "lpr.el" (20175 +;;;;;; 42237)) ;;; Generated autoloads from lpr.el -(defvar lpr-windows-system (memq system-type '(ms-dos windows-nt))) +(defvar lpr-windows-system (memq system-type '(ms-dos windows-nt)) "\ +Non-nil if running on MS-DOS or MS Windows.") -(defvar lpr-lp-system (memq system-type '(usg-unix-v hpux irix))) +(defvar lpr-lp-system (memq system-type '(usg-unix-v hpux irix)) "\ +Non-nil if running on a system type that uses the \"lp\" command.") (defvar printer-name (and (eq system-type 'ms-dos) "PRN") "\ The name of a local printer to which data is sent for printing. @@ -16958,7 +16972,7 @@ ;;;*** ;;;### (autoloads (what-domain mail-extract-address-components) "mail-extr" -;;;;;; "mail/mail-extr.el" (20119 34052)) +;;;;;; "mail/mail-extr.el" (20161 61915)) ;;; Generated autoloads from mail/mail-extr.el (autoload 'mail-extract-address-components "mail-extr" "\ @@ -17212,7 +17226,7 @@ ;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode ;;;;;; makefile-gmake-mode makefile-automake-mode makefile-mode) -;;;;;; "make-mode" "progmodes/make-mode.el" (20119 34052)) +;;;;;; "make-mode" "progmodes/make-mode.el" (20177 52156)) ;;; Generated autoloads from progmodes/make-mode.el (autoload 'makefile-mode "make-mode" "\ @@ -17342,7 +17356,7 @@ ;;;*** ;;;### (autoloads (Man-bookmark-jump man-follow man) "man" "man.el" -;;;;;; (20119 34052)) +;;;;;; (20177 52156)) ;;; Generated autoloads from man.el (defalias 'manual-entry 'man) @@ -17452,7 +17466,7 @@ ;;;;;; message-forward-make-body message-forward message-recover ;;;;;; message-supersede message-cancel-news message-followup message-wide-reply ;;;;;; message-reply message-news message-mail message-mode) "message" -;;;;;; "gnus/message.el" (20136 50092)) +;;;;;; "gnus/message.el" (20182 20223)) ;;; Generated autoloads from gnus/message.el (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook) @@ -17618,7 +17632,7 @@ ;;;*** ;;;### (autoloads (metapost-mode metafont-mode) "meta-mode" "progmodes/meta-mode.el" -;;;;;; (20119 34052)) +;;;;;; (20166 6221)) ;;; Generated autoloads from progmodes/meta-mode.el (autoload 'metafont-mode "meta-mode" "\ @@ -17635,7 +17649,7 @@ ;;;### (autoloads (metamail-region metamail-buffer metamail-interpret-body ;;;;;; metamail-interpret-header) "metamail" "mail/metamail.el" -;;;;;; (20119 34052)) +;;;;;; (20168 40835)) ;;; Generated autoloads from mail/metamail.el (autoload 'metamail-interpret-header "metamail" "\ @@ -17680,7 +17694,7 @@ ;;;### (autoloads (mh-fully-kill-draft mh-send-letter mh-user-agent-compose ;;;;;; mh-smail-batch mh-smail-other-window mh-smail) "mh-comp" -;;;;;; "mh-e/mh-comp.el" (20119 34052)) +;;;;;; "mh-e/mh-comp.el" (20161 61915)) ;;; Generated autoloads from mh-e/mh-comp.el (autoload 'mh-smail "mh-comp" "\ @@ -17770,7 +17784,7 @@ ;;;*** -;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (20119 34052)) +;;;### (autoloads (mh-version) "mh-e" "mh-e/mh-e.el" (20169 56777)) ;;; Generated autoloads from mh-e/mh-e.el (put 'mh-progs 'risky-local-variable t) @@ -17956,7 +17970,7 @@ ;;;### (autoloads (multi-isearch-files-regexp multi-isearch-files ;;;;;; multi-isearch-buffers-regexp multi-isearch-buffers multi-isearch-setup) -;;;;;; "misearch" "misearch.el" (20119 34052)) +;;;;;; "misearch" "misearch.el" (20168 40835)) ;;; Generated autoloads from misearch.el (add-hook 'isearch-mode-hook 'multi-isearch-setup) @@ -18038,7 +18052,7 @@ ;;;*** ;;;### (autoloads (mixal-mode) "mixal-mode" "progmodes/mixal-mode.el" -;;;;;; (20119 34052)) +;;;;;; (20163 6516)) ;;; Generated autoloads from progmodes/mixal-mode.el (autoload 'mixal-mode "mixal-mode" "\ @@ -18130,7 +18144,7 @@ ;;;*** ;;;### (autoloads (mml-attach-file mml-to-mime) "mml" "gnus/mml.el" -;;;;;; (20136 50092)) +;;;;;; (20177 52156)) ;;; Generated autoloads from gnus/mml.el (autoload 'mml-to-mime "mml" "\ @@ -18212,8 +18226,8 @@ ;;;*** -;;;### (autoloads (m2-mode) "modula2" "progmodes/modula2.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (m2-mode) "modula2" "progmodes/modula2.el" (20161 +;;;;;; 61915)) ;;; Generated autoloads from progmodes/modula2.el (defalias 'modula-2-mode 'm2-mode) @@ -18320,8 +18334,8 @@ ;;;*** -;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (20126 -;;;;;; 50277)) +;;;### (autoloads (mouse-sel-mode) "mouse-sel" "mouse-sel.el" (20168 +;;;;;; 40835)) ;;; Generated autoloads from mouse-sel.el (defvar mouse-sel-mode nil "\ @@ -18364,7 +18378,7 @@ ;;;*** -;;;### (autoloads (mpc) "mpc" "mpc.el" (20120 43280)) +;;;### (autoloads (mpc) "mpc" "mpc.el" (20177 52156)) ;;; Generated autoloads from mpc.el (autoload 'mpc "mpc" "\ @@ -18414,7 +18428,7 @@ ;;;;;; describe-current-coding-system describe-current-coding-system-briefly ;;;;;; describe-coding-system describe-character-set list-charset-chars ;;;;;; read-charset list-character-sets) "mule-diag" "international/mule-diag.el" -;;;;;; (20119 34052)) +;;;;;; (20161 61915)) ;;; Generated autoloads from international/mule-diag.el (autoload 'list-character-sets "mule-diag" "\ @@ -19118,7 +19132,7 @@ ;;;*** ;;;### (autoloads (newsticker-plainview) "newst-plainview" "net/newst-plainview.el" -;;;;;; (20119 34052)) +;;;;;; (20167 36027)) ;;; Generated autoloads from net/newst-plainview.el (autoload 'newsticker-plainview "newst-plainview" "\ @@ -19161,7 +19175,7 @@ ;;;*** ;;;### (autoloads (newsticker-treeview) "newst-treeview" "net/newst-treeview.el" -;;;;;; (20141 61905)) +;;;;;; (20168 40835)) ;;; Generated autoloads from net/newst-treeview.el (autoload 'newsticker-treeview "newst-treeview" "\ @@ -19172,7 +19186,7 @@ ;;;*** ;;;### (autoloads (nndiary-generate-nov-databases) "nndiary" "gnus/nndiary.el" -;;;;;; (20119 34052)) +;;;;;; (20168 40835)) ;;; Generated autoloads from gnus/nndiary.el (autoload 'nndiary-generate-nov-databases "nndiary" "\ @@ -19210,7 +19224,7 @@ ;;;*** ;;;### (autoloads (nnml-generate-nov-databases) "nnml" "gnus/nnml.el" -;;;;;; (20119 34052)) +;;;;;; (20177 52156)) ;;; Generated autoloads from gnus/nnml.el (autoload 'nnml-generate-nov-databases "nnml" "\ @@ -19367,7 +19381,7 @@ ;;;;;; org-babel-pop-to-session-maybe org-babel-load-in-session-maybe ;;;;;; org-babel-expand-src-block-maybe org-babel-view-src-block-info ;;;;;; org-babel-execute-maybe org-babel-execute-safely-maybe) "ob" -;;;;;; "org/ob.el" (20119 34052)) +;;;;;; "org/ob.el" (20173 62431)) ;;; Generated autoloads from org/ob.el (autoload 'org-babel-execute-safely-maybe "ob" "\ @@ -19414,7 +19428,7 @@ execution and the collection and formatting of results can be controlled through a variety of header arguments. -With prefix argument ARG, force re-execution even if a an +With prefix argument ARG, force re-execution even if an existing result cached in the buffer would otherwise have been returned. @@ -19759,7 +19773,7 @@ ;;;;;; org-insert-link-global org-store-link org-run-like-in-org-mode ;;;;;; turn-on-orgstruct++ turn-on-orgstruct orgstruct-mode org-global-cycle ;;;;;; org-mode org-babel-do-load-languages) "org" "org/org.el" -;;;;;; (20119 34052)) +;;;;;; (20169 56777)) ;;; Generated autoloads from org/org.el (autoload 'org-babel-do-load-languages "org" "\ @@ -19983,7 +19997,7 @@ ;;;;;; org-diary org-agenda-list-stuck-projects org-tags-view org-todo-list ;;;;;; org-search-view org-agenda-list org-batch-store-agenda-views ;;;;;; org-store-agenda-views org-batch-agenda-csv org-batch-agenda -;;;;;; org-agenda) "org-agenda" "org/org-agenda.el" (20119 34052)) +;;;;;; org-agenda) "org-agenda" "org/org-agenda.el" (20177 52156)) ;;; Generated autoloads from org/org-agenda.el (autoload 'org-agenda "org-agenda" "\ @@ -20335,7 +20349,7 @@ ;;;*** ;;;### (autoloads (org-bbdb-anniversaries) "org-bbdb" "org/org-bbdb.el" -;;;;;; (20119 34052)) +;;;;;; (20164 31636)) ;;; Generated autoloads from org/org-bbdb.el (autoload 'org-bbdb-anniversaries "org-bbdb" "\ @@ -20346,7 +20360,7 @@ ;;;*** ;;;### (autoloads (org-capture-import-remember-templates org-capture-insert-template-here -;;;;;; org-capture) "org-capture" "org/org-capture.el" (20119 34052)) +;;;;;; org-capture) "org-capture" "org/org-capture.el" (20169 56777)) ;;; Generated autoloads from org/org-capture.el (autoload 'org-capture "org-capture" "\ @@ -20384,7 +20398,7 @@ ;;;*** ;;;### (autoloads (org-clock-persistence-insinuate org-get-clocktable) -;;;;;; "org-clock" "org/org-clock.el" (20119 34052)) +;;;;;; "org-clock" "org/org-clock.el" (20173 2352)) ;;; Generated autoloads from org/org-clock.el (autoload 'org-get-clocktable "org-clock" "\ @@ -20495,7 +20509,7 @@ ;;;### (autoloads (org-insert-export-options-template org-export-as-org ;;;;;; org-export-visible org-export) "org-exp" "org/org-exp.el" -;;;;;; (20119 34052)) +;;;;;; (20167 36027)) ;;; Generated autoloads from org/org-exp.el (autoload 'org-export "org-exp" "\ @@ -20585,7 +20599,7 @@ ;;;*** ;;;### (autoloads (org-footnote-normalize org-footnote-action) "org-footnote" -;;;;;; "org/org-footnote.el" (20119 34052)) +;;;;;; "org/org-footnote.el" (20161 61915)) ;;; Generated autoloads from org/org-footnote.el (autoload 'org-footnote-action "org-footnote" "\ @@ -20636,7 +20650,7 @@ ;;;### (autoloads (org-freemind-to-org-mode org-freemind-from-org-sparse-tree ;;;;;; org-freemind-from-org-mode org-freemind-from-org-mode-node ;;;;;; org-freemind-show org-export-as-freemind) "org-freemind" -;;;;;; "org/org-freemind.el" (20119 34052)) +;;;;;; "org/org-freemind.el" (20173 2352)) ;;; Generated autoloads from org/org-freemind.el (autoload 'org-export-as-freemind "org-freemind" "\ @@ -20791,7 +20805,7 @@ ;;;### (autoloads (org-export-icalendar-combine-agenda-files org-export-icalendar-all-agenda-files ;;;;;; org-export-icalendar-this-file) "org-icalendar" "org/org-icalendar.el" -;;;;;; (20119 34052)) +;;;;;; (20164 31636)) ;;; Generated autoloads from org/org-icalendar.el (autoload 'org-export-icalendar-this-file "org-icalendar" "\ @@ -20916,7 +20930,7 @@ ;;;### (autoloads (org-export-as-pdf-and-open org-export-as-pdf org-export-as-latex ;;;;;; org-export-region-as-latex org-replace-region-by-latex org-export-as-latex-to-buffer ;;;;;; org-export-as-latex-batch) "org-latex" "org/org-latex.el" -;;;;;; (20119 34052)) +;;;;;; (20164 31636)) ;;; Generated autoloads from org/org-latex.el (autoload 'org-export-as-latex-batch "org-latex" "\ @@ -21022,7 +21036,7 @@ ;;;*** ;;;### (autoloads (org-plot/gnuplot) "org-plot" "org/org-plot.el" -;;;;;; (20119 34052)) +;;;;;; (20157 54680)) ;;; Generated autoloads from org/org-plot.el (autoload 'org-plot/gnuplot "org-plot" "\ @@ -21036,7 +21050,7 @@ ;;;### (autoloads (org-publish-current-project org-publish-current-file ;;;;;; org-publish-all org-publish) "org-publish" "org/org-publish.el" -;;;;;; (20119 34052)) +;;;;;; (20161 61915)) ;;; Generated autoloads from org/org-publish.el (defalias 'org-publish-project 'org-publish) @@ -21070,7 +21084,7 @@ ;;;### (autoloads (org-remember-handler org-remember org-remember-apply-template ;;;;;; org-remember-annotation org-remember-insinuate) "org-remember" -;;;;;; "org/org-remember.el" (20119 34052)) +;;;;;; "org/org-remember.el" (20166 6221)) ;;; Generated autoloads from org/org-remember.el (autoload 'org-remember-insinuate "org-remember" "\ @@ -21146,7 +21160,7 @@ ;;;*** ;;;### (autoloads (org-table-to-lisp orgtbl-mode turn-on-orgtbl) -;;;;;; "org-table" "org/org-table.el" (20119 34052)) +;;;;;; "org-table" "org/org-table.el" (20169 56777)) ;;; Generated autoloads from org/org-table.el (autoload 'turn-on-orgtbl "org-table" "\ @@ -21170,7 +21184,7 @@ ;;;*** ;;;### (autoloads (org-export-as-taskjuggler-and-open org-export-as-taskjuggler) -;;;;;; "org-taskjuggler" "org/org-taskjuggler.el" (20119 34052)) +;;;;;; "org-taskjuggler" "org/org-taskjuggler.el" (20166 6221)) ;;; Generated autoloads from org/org-taskjuggler.el (autoload 'org-export-as-taskjuggler "org-taskjuggler" "\ @@ -21271,7 +21285,7 @@ ;;;*** ;;;### (autoloads (outline-minor-mode outline-mode) "outline" "outline.el" -;;;;;; (20126 50306)) +;;;;;; (20163 6516)) ;;; Generated autoloads from outline.el (put 'outline-regexp 'safe-local-variable 'stringp) (put 'outline-heading-end-regexp 'safe-local-variable 'stringp) @@ -21335,7 +21349,7 @@ ;;;### (autoloads (list-packages describe-package package-initialize ;;;;;; package-refresh-contents package-install-file package-install-from-buffer ;;;;;; package-install package-enable-at-startup) "package" "emacs-lisp/package.el" -;;;;;; (20139 30186)) +;;;;;; (20168 40835)) ;;; Generated autoloads from emacs-lisp/package.el (defvar package-enable-at-startup t "\ @@ -21445,8 +21459,8 @@ ;;;*** -;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (pascal-mode) "pascal" "progmodes/pascal.el" (20168 +;;;;;; 40835)) ;;; Generated autoloads from progmodes/pascal.el (autoload 'pascal-mode "pascal" "\ @@ -21770,7 +21784,7 @@ ;;;### (autoloads (cvs-dired-use-hook cvs-dired-action cvs-status ;;;;;; cvs-update cvs-examine cvs-quickdir cvs-checkout) "pcvs" -;;;;;; "vc/pcvs.el" (20119 34052)) +;;;;;; "vc/pcvs.el" (20166 6221)) ;;; Generated autoloads from vc/pcvs.el (autoload 'cvs-checkout "pcvs" "\ @@ -21845,10 +21859,11 @@ ;;;*** -;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (20119 34052)) +;;;### (autoloads nil "pcvs-defs" "vc/pcvs-defs.el" (20175 42237)) ;;; Generated autoloads from vc/pcvs-defs.el -(defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] `(menu-item ,(purecopy "Directory Status") cvs-status :help ,(purecopy "A more verbose status of a workarea"))) (define-key m [checkout] `(menu-item ,(purecopy "Checkout Module") cvs-checkout :help ,(purecopy "Check out a module from the repository"))) (define-key m [update] `(menu-item ,(purecopy "Update Directory") cvs-update :help ,(purecopy "Fetch updates from the repository"))) (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) (fset 'cvs-global-menu m))) +(defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] `(menu-item ,(purecopy "Directory Status") cvs-status :help ,(purecopy "A more verbose status of a workarea"))) (define-key m [checkout] `(menu-item ,(purecopy "Checkout Module") cvs-checkout :help ,(purecopy "Check out a module from the repository"))) (define-key m [update] `(menu-item ,(purecopy "Update Directory") cvs-update :help ,(purecopy "Fetch updates from the repository"))) (define-key m [examine] `(menu-item ,(purecopy "Examine Directory") cvs-examine :help ,(purecopy "Examine the current state of a workarea"))) (fset 'cvs-global-menu m)) "\ +Global menu used by PCL-CVS.") ;;;*** @@ -22034,7 +22049,7 @@ ;;;*** -;;;### (autoloads (pop3-movemail) "pop3" "gnus/pop3.el" (20119 34052)) +;;;### (autoloads (pop3-movemail) "pop3" "gnus/pop3.el" (20177 52156)) ;;; Generated autoloads from gnus/pop3.el (autoload 'pop3-movemail "pop3" "\ @@ -22115,7 +22130,7 @@ ;;;;;; pr-ps-buffer-print pr-ps-buffer-using-ghostscript pr-ps-buffer-preview ;;;;;; pr-ps-directory-ps-print pr-ps-directory-print pr-ps-directory-using-ghostscript ;;;;;; pr-ps-directory-preview pr-interface) "printing" "printing.el" -;;;;;; (20119 34052)) +;;;;;; (20175 42237)) ;;; Generated autoloads from printing.el (autoload 'pr-interface "printing" "\ @@ -22718,7 +22733,7 @@ ;;;*** ;;;### (autoloads (run-prolog mercury-mode prolog-mode) "prolog" -;;;;;; "progmodes/prolog.el" (20119 34052)) +;;;;;; "progmodes/prolog.el" (20177 52156)) ;;; Generated autoloads from progmodes/prolog.el (autoload 'prolog-mode "prolog" "\ @@ -22765,8 +22780,8 @@ ;;;*** -;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (ps-mode) "ps-mode" "progmodes/ps-mode.el" (20167 +;;;;;; 36027)) ;;; Generated autoloads from progmodes/ps-mode.el (autoload 'ps-mode "ps-mode" "\ @@ -22817,8 +22832,8 @@ ;;;;;; ps-spool-region ps-spool-buffer-with-faces ps-spool-buffer ;;;;;; ps-print-region-with-faces ps-print-region ps-print-buffer-with-faces ;;;;;; ps-print-buffer ps-print-customize ps-print-color-p ps-paper-type -;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (20119 -;;;;;; 34052)) +;;;;;; ps-page-dimensions-database) "ps-print" "ps-print.el" (20173 +;;;;;; 2352)) ;;; Generated autoloads from ps-print.el (defvar ps-page-dimensions-database (purecopy (list (list 'a4 (/ (* 72 21.0) 2.54) (/ (* 72 29.7) 2.54) "A4") (list 'a3 (/ (* 72 29.7) 2.54) (/ (* 72 42.0) 2.54) "A3") (list 'letter (* 72 8.5) (* 72 11.0) "Letter") (list 'legal (* 72 8.5) (* 72 14.0) "Legal") (list 'letter-small (* 72 7.68) (* 72 10.16) "LetterSmall") (list 'tabloid (* 72 11.0) (* 72 17.0) "Tabloid") (list 'ledger (* 72 17.0) (* 72 11.0) "Ledger") (list 'statement (* 72 5.5) (* 72 8.5) "Statement") (list 'executive (* 72 7.5) (* 72 10.0) "Executive") (list 'a4small (* 72 7.47) (* 72 10.85) "A4Small") (list 'b4 (* 72 10.125) (* 72 14.33) "B4") (list 'b5 (* 72 7.16) (* 72 10.125) "B5") '(addresslarge 236.0 99.0 "AddressLarge") '(addresssmall 236.0 68.0 "AddressSmall") '(cuthanging13 90.0 222.0 "CutHanging13") '(cuthanging15 90.0 114.0 "CutHanging15") '(diskette 181.0 136.0 "Diskette") '(eurofilefolder 139.0 112.0 "EuropeanFilefolder") '(eurofoldernarrow 526.0 107.0 "EuroFolderNarrow") '(eurofolderwide 526.0 136.0 "EuroFolderWide") '(euronamebadge 189.0 108.0 "EuroNameBadge") '(euronamebadgelarge 223.0 136.0 "EuroNameBadgeLarge") '(filefolder 230.0 37.0 "FileFolder") '(jewelry 76.0 136.0 "Jewelry") '(mediabadge 180.0 136.0 "MediaBadge") '(multipurpose 126.0 68.0 "MultiPurpose") '(retaillabel 90.0 104.0 "RetailLabel") '(shipping 271.0 136.0 "Shipping") '(slide35mm 26.0 104.0 "Slide35mm") '(spine8mm 187.0 26.0 "Spine8mm") '(topcoated 425.19685 136.0 "TopCoatedPaper") '(topcoatedpaper 396.0 136.0 "TopcoatedPaper150") '(vhsface 205.0 127.0 "VHSFace") '(vhsspine 400.0 50.0 "VHSSpine") '(zipdisk 156.0 136.0 "ZipDisk"))) "\ @@ -23015,7 +23030,7 @@ ;;;*** ;;;### (autoloads (jython-mode python-mode python-after-info-look -;;;;;; run-python) "python" "progmodes/python.el" (20119 34052)) +;;;;;; run-python) "python" "progmodes/python.el" (20169 56777)) ;;; Generated autoloads from progmodes/python.el (add-to-list 'interpreter-mode-alist (cons (purecopy "jython") 'jython-mode)) @@ -23124,7 +23139,7 @@ ;;;;;; quail-defrule quail-install-decode-map quail-install-map ;;;;;; quail-define-rules quail-show-keyboard-layout quail-set-keyboard-layout ;;;;;; quail-define-package quail-use-package quail-title) "quail" -;;;;;; "international/quail.el" (20119 34052)) +;;;;;; "international/quail.el" (20166 6221)) ;;; Generated autoloads from international/quail.el (autoload 'quail-title "quail" "\ @@ -23355,8 +23370,8 @@ ;;;### (autoloads (quickurl-list quickurl-list-mode quickurl-edit-urls ;;;;;; quickurl-browse-url-ask quickurl-browse-url quickurl-add-url -;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (20119 -;;;;;; 34052)) +;;;;;; quickurl-ask quickurl) "quickurl" "net/quickurl.el" (20168 +;;;;;; 40835)) ;;; Generated autoloads from net/quickurl.el (defconst quickurl-reread-hook-postfix "\n;; Local Variables:\n;; eval: (progn (require 'quickurl) (add-hook 'local-write-file-hooks (lambda () (quickurl-read) nil)))\n;; End:\n" "\ @@ -23428,7 +23443,7 @@ ;;;*** ;;;### (autoloads (rcirc-track-minor-mode rcirc-connect rcirc) "rcirc" -;;;;;; "net/rcirc.el" (20138 51043)) +;;;;;; "net/rcirc.el" (20169 56777)) ;;; Generated autoloads from net/rcirc.el (autoload 'rcirc "rcirc" "\ @@ -23494,7 +23509,7 @@ ;;;*** -;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (20126 50335)) +;;;### (autoloads (recentf-mode) "recentf" "recentf.el" (20167 36027)) ;;; Generated autoloads from recentf.el (defvar recentf-mode nil "\ @@ -23682,7 +23697,7 @@ ;;;*** ;;;### (autoloads (reftex-reset-scanning-information reftex-mode -;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (20136 50092)) +;;;;;; turn-on-reftex) "reftex" "textmodes/reftex.el" (20166 6221)) ;;; Generated autoloads from textmodes/reftex.el (autoload 'turn-on-reftex "reftex" "\ @@ -23738,7 +23753,7 @@ ;;;*** ;;;### (autoloads (reftex-citation) "reftex-cite" "textmodes/reftex-cite.el" -;;;;;; (20119 34052)) +;;;;;; (20169 56777)) ;;; Generated autoloads from textmodes/reftex-cite.el (autoload 'reftex-citation "reftex-cite" "\ @@ -23768,7 +23783,7 @@ ;;;*** ;;;### (autoloads (reftex-isearch-minor-mode) "reftex-global" "textmodes/reftex-global.el" -;;;;;; (20119 34052)) +;;;;;; (20166 6221)) ;;; Generated autoloads from textmodes/reftex-global.el (autoload 'reftex-isearch-minor-mode "reftex-global" "\ @@ -23785,7 +23800,7 @@ ;;;*** ;;;### (autoloads (reftex-index-phrases-mode) "reftex-index" "textmodes/reftex-index.el" -;;;;;; (20119 34052)) +;;;;;; (20163 6516)) ;;; Generated autoloads from textmodes/reftex-index.el (autoload 'reftex-index-phrases-mode "reftex-index" "\ @@ -23818,7 +23833,7 @@ ;;;*** ;;;### (autoloads (reftex-all-document-files) "reftex-parse" "textmodes/reftex-parse.el" -;;;;;; (20119 34052)) +;;;;;; (20161 61915)) ;;; Generated autoloads from textmodes/reftex-parse.el (autoload 'reftex-all-document-files "reftex-parse" "\ @@ -23872,7 +23887,7 @@ ;;;### (autoloads (remember-diary-extract-entries remember-clipboard ;;;;;; remember-other-frame remember) "remember" "textmodes/remember.el" -;;;;;; (20119 34052)) +;;;;;; (20161 61915)) ;;; Generated autoloads from textmodes/remember.el (autoload 'remember "remember" "\ @@ -23903,7 +23918,7 @@ ;;;*** -;;;### (autoloads (repeat) "repeat" "repeat.el" (20119 34052)) +;;;### (autoloads (repeat) "repeat" "repeat.el" (20173 2352)) ;;; Generated autoloads from repeat.el (autoload 'repeat "repeat" "\ @@ -24085,7 +24100,7 @@ ;;;;;; rmail-secondary-file-directory rmail-primary-inbox-list rmail-highlighted-headers ;;;;;; rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers ;;;;;; rmail-user-mail-address-regexp rmail-movemail-variant-p) -;;;;;; "rmail" "mail/rmail.el" (20138 48832)) +;;;;;; "rmail" "mail/rmail.el" (20173 62675)) ;;; Generated autoloads from mail/rmail.el (autoload 'rmail-movemail-variant-p "rmail" "\ @@ -24183,8 +24198,8 @@ (defvar rmail-insert-mime-forwarded-message-function nil "\ Function to insert a message in MIME format so it can be forwarded. -This function is called if `rmail-enable-mime' or -`rmail-enable-mime-composing' is non-nil. +This function is called if `rmail-enable-mime' and +`rmail-enable-mime-composing' are non-nil. It is called with one argument FORWARD-BUFFER, which is a buffer containing the message to forward. The current buffer is the outgoing mail buffer.") @@ -24269,7 +24284,7 @@ ;;;*** ;;;### (autoloads (rmail-output-body-to-file rmail-output-as-seen -;;;;;; rmail-output) "rmailout" "mail/rmailout.el" (20119 34052)) +;;;;;; rmail-output) "rmailout" "mail/rmailout.el" (20173 2352)) ;;; Generated autoloads from mail/rmailout.el (put 'rmail-output-file-alist 'risky-local-variable t) @@ -24359,7 +24374,7 @@ ;;;*** ;;;### (autoloads (rng-validate-mode) "rng-valid" "nxml/rng-valid.el" -;;;;;; (20119 34052)) +;;;;;; (20177 52156)) ;;; Generated autoloads from nxml/rng-valid.el (autoload 'rng-validate-mode "rng-valid" "\ @@ -24418,7 +24433,7 @@ ;;;*** ;;;### (autoloads (robin-use-package robin-modify-package robin-define-package) -;;;;;; "robin" "international/robin.el" (20119 34052)) +;;;;;; "robin" "international/robin.el" (20161 61915)) ;;; Generated autoloads from international/robin.el (autoload 'robin-define-package "robin" "\ @@ -24451,7 +24466,7 @@ ;;;*** ;;;### (autoloads (toggle-rot13-mode rot13-other-window rot13-region -;;;;;; rot13-string rot13) "rot13" "rot13.el" (20119 34052)) +;;;;;; rot13-string rot13) "rot13" "rot13.el" (20154 8214)) ;;; Generated autoloads from rot13.el (autoload 'rot13 "rot13" "\ @@ -24489,7 +24504,7 @@ ;;;*** ;;;### (autoloads (rst-minor-mode rst-mode) "rst" "textmodes/rst.el" -;;;;;; (20127 24234)) +;;;;;; (20177 52156)) ;;; Generated autoloads from textmodes/rst.el (add-to-list 'auto-mode-alist (purecopy '("\\.re?st\\'" . rst-mode))) @@ -24565,8 +24580,8 @@ ;;;*** -;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (rx rx-to-string) "rx" "emacs-lisp/rx.el" (20161 +;;;;;; 61915)) ;;; Generated autoloads from emacs-lisp/rx.el (autoload 'rx-to-string "rx" "\ @@ -25006,7 +25021,7 @@ ;;;*** -;;;### (autoloads nil "secrets" "net/secrets.el" (20119 34052)) +;;;### (autoloads nil "secrets" "net/secrets.el" (20175 42237)) ;;; Generated autoloads from net/secrets.el (when (featurep 'dbusbind) (autoload 'secrets-show-secrets "secrets" nil t)) @@ -25014,7 +25029,7 @@ ;;;*** ;;;### (autoloads (semantic-mode semantic-default-submodes) "semantic" -;;;;;; "cedet/semantic.el" (20127 23255)) +;;;;;; "cedet/semantic.el" (20173 2352)) ;;; Generated autoloads from cedet/semantic.el (defvar semantic-default-submodes '(global-semantic-idle-scheduler-mode global-semanticdb-minor-mode) "\ @@ -25350,8 +25365,8 @@ ;;;*** ;;;### (autoloads (server-save-buffers-kill-terminal server-mode -;;;;;; server-force-delete server-start) "server" "server.el" (20126 -;;;;;; 50430)) +;;;;;; server-force-delete server-start) "server" "server.el" (20172 +;;;;;; 34261)) ;;; Generated autoloads from server.el (put 'server-host 'risky-local-variable t) @@ -25418,7 +25433,7 @@ ;;;*** -;;;### (autoloads (ses-mode) "ses" "ses.el" (20119 34052)) +;;;### (autoloads (ses-mode) "ses" "ses.el" (20173 2352)) ;;; Generated autoloads from ses.el (autoload 'ses-mode "ses" "\ @@ -25437,7 +25452,7 @@ ;;;*** ;;;### (autoloads (html-mode sgml-mode) "sgml-mode" "textmodes/sgml-mode.el" -;;;;;; (20127 24193)) +;;;;;; (20167 36027)) ;;; Generated autoloads from textmodes/sgml-mode.el (autoload 'sgml-mode "sgml-mode" "\ @@ -25503,7 +25518,7 @@ ;;;*** ;;;### (autoloads (sh-mode) "sh-script" "progmodes/sh-script.el" -;;;;;; (20120 43373)) +;;;;;; (20168 40835)) ;;; Generated autoloads from progmodes/sh-script.el (put 'sh-shell 'safe-local-variable 'symbolp) @@ -25658,7 +25673,7 @@ ;;;*** ;;;### (autoloads (shell shell-dumb-shell-regexp) "shell" "shell.el" -;;;;;; (20126 50438)) +;;;;;; (20168 40835)) ;;; Generated autoloads from shell.el (defvar shell-dumb-shell-regexp (purecopy "cmd\\(proxy\\)?\\.exe") "\ @@ -25706,8 +25721,8 @@ ;;;*** -;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (shr-insert-document) "shr" "gnus/shr.el" (20172 +;;;;;; 34261)) ;;; Generated autoloads from gnus/shr.el (autoload 'shr-insert-document "shr" "\ @@ -25718,7 +25733,7 @@ ;;;*** ;;;### (autoloads (sieve-upload-and-bury sieve-upload sieve-manage) -;;;;;; "sieve" "gnus/sieve.el" (20119 34052)) +;;;;;; "sieve" "gnus/sieve.el" (20166 6221)) ;;; Generated autoloads from gnus/sieve.el (autoload 'sieve-manage "sieve" "\ @@ -25957,7 +25972,7 @@ ;;;*** ;;;### (autoloads (smtpmail-send-queued-mail smtpmail-send-it) "smtpmail" -;;;;;; "mail/smtpmail.el" (20119 34052)) +;;;;;; "mail/smtpmail.el" (20168 40835)) ;;; Generated autoloads from mail/smtpmail.el (autoload 'smtpmail-send-it "smtpmail" "\ @@ -25996,7 +26011,7 @@ ;;;*** ;;;### (autoloads (snmpv2-mode snmp-mode) "snmp-mode" "net/snmp-mode.el" -;;;;;; (20119 34052)) +;;;;;; (20161 61915)) ;;; Generated autoloads from net/snmp-mode.el (autoload 'snmp-mode "snmp-mode" "\ @@ -26041,8 +26056,8 @@ ;;;*** -;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (solitaire) "solitaire" "play/solitaire.el" (20166 +;;;;;; 6221)) ;;; Generated autoloads from play/solitaire.el (autoload 'solitaire "solitaire" "\ @@ -26263,8 +26278,8 @@ ;;;*** -;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (spam-initialize) "spam" "gnus/spam.el" (20167 +;;;;;; 36027)) ;;; Generated autoloads from gnus/spam.el (autoload 'spam-initialize "spam" "\ @@ -26280,7 +26295,7 @@ ;;;### (autoloads (spam-report-deagentize spam-report-agentize spam-report-url-to-file ;;;;;; spam-report-url-ping-mm-url spam-report-process-queue) "spam-report" -;;;;;; "gnus/spam-report.el" (20119 34052)) +;;;;;; "gnus/spam-report.el" (20166 6221)) ;;; Generated autoloads from gnus/spam-report.el (autoload 'spam-report-process-queue "spam-report" "\ @@ -26323,7 +26338,7 @@ ;;;*** ;;;### (autoloads (speedbar-get-focus speedbar-frame-mode) "speedbar" -;;;;;; "speedbar.el" (20119 34052)) +;;;;;; "speedbar.el" (20177 52156)) ;;; Generated autoloads from speedbar.el (defalias 'speedbar 'speedbar-frame-mode) @@ -26367,7 +26382,7 @@ ;;;;;; sql-ms sql-ingres sql-solid sql-mysql sql-sqlite sql-informix ;;;;;; sql-sybase sql-oracle sql-product-interactive sql-connect ;;;;;; sql-mode sql-help sql-add-product-keywords) "sql" "progmodes/sql.el" -;;;;;; (20119 34052)) +;;;;;; (20177 52156)) ;;; Generated autoloads from progmodes/sql.el (autoload 'sql-add-product-keywords "sql" "\ @@ -26863,7 +26878,7 @@ ;;;*** ;;;### (autoloads (srecode-template-mode) "srecode/srt-mode" "cedet/srecode/srt-mode.el" -;;;;;; (20119 34052)) +;;;;;; (20161 61915)) ;;; Generated autoloads from cedet/srecode/srt-mode.el (autoload 'srecode-template-mode "srecode/srt-mode" "\ @@ -26876,7 +26891,7 @@ ;;;*** ;;;### (autoloads (starttls-open-stream) "starttls" "gnus/starttls.el" -;;;;;; (20119 34052)) +;;;;;; (20175 42237)) ;;; Generated autoloads from gnus/starttls.el (autoload 'starttls-open-stream "starttls" "\ @@ -26893,7 +26908,7 @@ Third arg is name of the host to connect to, or its IP address. Fourth arg PORT is an integer specifying a port to connect to. If `starttls-use-gnutls' is nil, this may also be a service name, but -GNUTLS requires a port number. +GnuTLS requires a port number. \(fn NAME BUFFER HOST PORT)" nil nil) @@ -27191,7 +27206,7 @@ ;;;;;; table-recognize table-insert-row-column table-insert-column ;;;;;; table-insert-row table-insert table-point-left-cell-hook ;;;;;; table-point-entered-cell-hook table-load-hook table-cell-map-hook) -;;;;;; "table" "textmodes/table.el" (20119 34052)) +;;;;;; "table" "textmodes/table.el" (20179 5306)) ;;; Generated autoloads from textmodes/table.el (defvar table-cell-map-hook nil "\ @@ -27780,7 +27795,7 @@ ;;;*** ;;;### (autoloads (tabulated-list-mode) "tabulated-list" "emacs-lisp/tabulated-list.el" -;;;;;; (20119 34052)) +;;;;;; (20169 56777)) ;;; Generated autoloads from emacs-lisp/tabulated-list.el (autoload 'tabulated-list-mode "tabulated-list" "\ @@ -27837,7 +27852,7 @@ ;;;*** -;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (20129 34168)) +;;;### (autoloads (tar-mode) "tar-mode" "tar-mode.el" (20161 61915)) ;;; Generated autoloads from tar-mode.el (autoload 'tar-mode "tar-mode" "\ @@ -27861,7 +27876,7 @@ ;;;*** ;;;### (autoloads (tcl-help-on-word inferior-tcl tcl-mode) "tcl" -;;;;;; "progmodes/tcl.el" (20119 34052)) +;;;;;; "progmodes/tcl.el" (20164 31636)) ;;; Generated autoloads from progmodes/tcl.el (autoload 'tcl-mode "tcl" "\ @@ -27935,7 +27950,7 @@ ;;;*** ;;;### (autoloads (serial-term ansi-term term make-term) "term" "term.el" -;;;;;; (20119 34052)) +;;;;;; (20177 52156)) ;;; Generated autoloads from term.el (autoload 'make-term "term" "\ @@ -27977,8 +27992,8 @@ ;;;*** -;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (terminal-emulator) "terminal" "terminal.el" (20167 +;;;;;; 36027)) ;;; Generated autoloads from terminal.el (autoload 'terminal-emulator "terminal" "\ @@ -28015,7 +28030,7 @@ ;;;*** ;;;### (autoloads (testcover-this-defun) "testcover" "emacs-lisp/testcover.el" -;;;;;; (20119 34052)) +;;;;;; (20173 2352)) ;;; Generated autoloads from emacs-lisp/testcover.el (autoload 'testcover-this-defun "testcover" "\ @@ -28056,7 +28071,7 @@ ;;;;;; tex-start-commands tex-start-options slitex-run-command latex-run-command ;;;;;; tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp ;;;;;; tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el" -;;;;;; (20134 8463)) +;;;;;; (20177 52156)) ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -28358,7 +28373,7 @@ ;;;*** ;;;### (autoloads (texi2info texinfo-format-region texinfo-format-buffer) -;;;;;; "texinfmt" "textmodes/texinfmt.el" (20119 34052)) +;;;;;; "texinfmt" "textmodes/texinfmt.el" (20166 6221)) ;;; Generated autoloads from textmodes/texinfmt.el (autoload 'texinfo-format-buffer "texinfmt" "\ @@ -28484,7 +28499,7 @@ ;;;### (autoloads (thai-composition-function thai-compose-buffer ;;;;;; thai-compose-string thai-compose-region) "thai-util" "language/thai-util.el" -;;;;;; (20119 34052)) +;;;;;; (20169 56777)) ;;; Generated autoloads from language/thai-util.el (autoload 'thai-compose-region "thai-util" "\ @@ -28576,7 +28591,7 @@ ;;;### (autoloads (thumbs-dired-setroot thumbs-dired-show thumbs-dired-show-marked ;;;;;; thumbs-show-from-dir thumbs-find-thumb) "thumbs" "thumbs.el" -;;;;;; (20119 34052)) +;;;;;; (20169 56777)) ;;; Generated autoloads from thumbs.el (autoload 'thumbs-find-thumb "thumbs" "\ @@ -28614,8 +28629,8 @@ ;;;;;; tibetan-post-read-conversion tibetan-compose-buffer tibetan-decompose-buffer ;;;;;; tibetan-decompose-string tibetan-decompose-region tibetan-compose-region ;;;;;; tibetan-compose-string tibetan-transcription-to-tibetan tibetan-tibetan-to-transcription -;;;;;; tibetan-char-p) "tibet-util" "language/tibet-util.el" (20119 -;;;;;; 34052)) +;;;;;; tibetan-char-p) "tibet-util" "language/tibet-util.el" (20175 +;;;;;; 42237)) ;;; Generated autoloads from language/tibet-util.el (autoload 'tibetan-char-p "tibet-util" "\ @@ -28938,7 +28953,7 @@ ;;;;;; timeclock-workday-remaining-string timeclock-reread-log timeclock-query-out ;;;;;; timeclock-change timeclock-status-string timeclock-out timeclock-in ;;;;;; timeclock-modeline-display) "timeclock" "calendar/timeclock.el" -;;;;;; (20119 34052)) +;;;;;; (20166 6221)) ;;; Generated autoloads from calendar/timeclock.el (autoload 'timeclock-modeline-display "timeclock" "\ @@ -29038,7 +29053,7 @@ ;;;*** ;;;### (autoloads (batch-titdic-convert titdic-convert) "titdic-cnv" -;;;;;; "international/titdic-cnv.el" (20119 34052)) +;;;;;; "international/titdic-cnv.el" (20175 42237)) ;;; Generated autoloads from international/titdic-cnv.el (autoload 'titdic-convert "titdic-cnv" "\ @@ -29061,7 +29076,7 @@ ;;;*** ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm" -;;;;;; "tmm.el" (20119 34052)) +;;;;;; "tmm.el" (20163 11019)) ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) @@ -29101,7 +29116,7 @@ ;;;### (autoloads (todo-show todo-cp todo-mode todo-print todo-top-priorities ;;;;;; todo-insert-item todo-add-item-non-interactively todo-add-category) -;;;;;; "todo-mode" "calendar/todo-mode.el" (20119 34052)) +;;;;;; "todo-mode" "calendar/todo-mode.el" (20168 40835)) ;;; Generated autoloads from calendar/todo-mode.el (autoload 'todo-add-category "todo-mode" "\ @@ -29344,7 +29359,7 @@ ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion ;;;;;; tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers ;;;;;; tramp-file-name-handler tramp-syntax tramp-mode) "tramp" -;;;;;; "net/tramp.el" (20127 27092)) +;;;;;; "net/tramp.el" (20179 5306)) ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -29487,8 +29502,8 @@ ;;;*** -;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (20140 -;;;;;; 41907)) +;;;### (autoloads (help-with-tutorial) "tutorial" "tutorial.el" (20177 +;;;;;; 52156)) ;;; Generated autoloads from tutorial.el (autoload 'help-with-tutorial "tutorial" "\ @@ -29862,7 +29877,7 @@ ;;;*** ;;;### (autoloads (unrmail batch-unrmail) "unrmail" "mail/unrmail.el" -;;;;;; (20119 34052)) +;;;;;; (20173 2352)) ;;; Generated autoloads from mail/unrmail.el (autoload 'batch-unrmail "unrmail" "\ @@ -29895,7 +29910,7 @@ ;;;*** ;;;### (autoloads (url-retrieve-synchronously url-retrieve) "url" -;;;;;; "url/url.el" (20119 34052)) +;;;;;; "url/url.el" (20163 6516)) ;;; Generated autoloads from url/url.el (autoload 'url-retrieve "url" "\ @@ -30011,7 +30026,7 @@ ;;;*** ;;;### (autoloads (url-dav-vc-registered url-dav-supported-p) "url-dav" -;;;;;; "url/url-dav.el" (20119 34052)) +;;;;;; "url/url-dav.el" (20168 40835)) ;;; Generated autoloads from url/url-dav.el (autoload 'url-dav-supported-p "url-dav" "\ @@ -30113,7 +30128,7 @@ ;;;*** ;;;### (autoloads (url-http-options url-http-file-attributes url-http-file-exists-p -;;;;;; url-http) "url-http" "url/url-http.el" (20119 34052)) +;;;;;; url-http) "url-http" "url/url-http.el" (20167 36027)) ;;; Generated autoloads from url/url-http.el (autoload 'url-http "url-http" "\ @@ -30189,8 +30204,8 @@ ;;;*** -;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (20119 -;;;;;; 34052)) +;;;### (autoloads (url-ldap) "url-ldap" "url/url-ldap.el" (20166 +;;;;;; 6221)) ;;; Generated autoloads from url/url-ldap.el (autoload 'url-ldap "url-ldap" "\ @@ -30591,8 +30606,8 @@ ;;;;;; vc-print-log vc-retrieve-tag vc-create-tag vc-merge vc-insert-headers ;;;;;; vc-revision-other-window vc-root-diff vc-ediff vc-version-ediff ;;;;;; vc-diff vc-version-diff vc-register vc-next-action vc-before-checkin-hook -;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (20128 -;;;;;; 38948)) +;;;;;; vc-checkin-hook vc-checkout-hook) "vc" "vc/vc.el" (20173 +;;;;;; 2352)) ;;; Generated autoloads from vc/vc.el (defvar vc-checkout-hook nil "\ @@ -30912,7 +30927,7 @@ ;;;*** -;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (20119 34052)) +;;;### (autoloads nil "vc-arch" "vc/vc-arch.el" (20168 40835)) ;;; Generated autoloads from vc/vc-arch.el (defun vc-arch-registered (file) (if (vc-find-root file "{arch}/=tagging-method") @@ -30922,13 +30937,14 @@ ;;;*** -;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (20127 27092)) +;;;### (autoloads nil "vc-bzr" "vc/vc-bzr.el" (20175 42237)) ;;; Generated autoloads from vc/vc-bzr.el (defconst vc-bzr-admin-dirname ".bzr" "\ Name of the directory containing Bzr repository status files.") -(defconst vc-bzr-admin-checkout-format-file (concat vc-bzr-admin-dirname "/checkout/format")) +(defconst vc-bzr-admin-checkout-format-file (concat vc-bzr-admin-dirname "/checkout/format") "\ +Name of the format file in a .bzr directory.") (defun vc-bzr-registered (file) (if (vc-find-root file vc-bzr-admin-checkout-format-file) (progn @@ -30937,9 +30953,10 @@ ;;;*** -;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20119 34052)) +;;;### (autoloads nil "vc-cvs" "vc/vc-cvs.el" (20175 42237)) ;;; Generated autoloads from vc/vc-cvs.el - (defun vc-cvs-registered (f) +(defun vc-cvs-registered (f) + "Return non-nil if file F is registered with CVS." (when (file-readable-p (expand-file-name "CVS/Entries" (file-name-directory f))) (load "vc-cvs") @@ -30947,7 +30964,7 @@ ;;;*** -;;;### (autoloads (vc-dir) "vc-dir" "vc/vc-dir.el" (20119 34052)) +;;;### (autoloads (vc-dir) "vc-dir" "vc/vc-dir.el" (20168 40835)) ;;; Generated autoloads from vc/vc-dir.el (autoload 'vc-dir "vc-dir" "\ @@ -30972,7 +30989,7 @@ ;;;*** ;;;### (autoloads (vc-do-command) "vc-dispatcher" "vc/vc-dispatcher.el" -;;;;;; (20119 34052)) +;;;;;; (20169 56777)) ;;; Generated autoloads from vc/vc-dispatcher.el (autoload 'vc-do-command "vc-dispatcher" "\ @@ -31017,12 +31034,14 @@ ;;;*** -;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (20119 34052)) +;;;### (autoloads nil "vc-mtn" "vc/vc-mtn.el" (20175 42237)) ;;; Generated autoloads from vc/vc-mtn.el -(defconst vc-mtn-admin-dir "_MTN") +(defconst vc-mtn-admin-dir "_MTN" "\ +Name of the monotone directory.") -(defconst vc-mtn-admin-format (concat vc-mtn-admin-dir "/format")) +(defconst vc-mtn-admin-format (concat vc-mtn-admin-dir "/format") "\ +Name of the monotone directory's format file.") (defun vc-mtn-registered (file) (if (vc-find-root file vc-mtn-admin-format) (progn @@ -31032,7 +31051,7 @@ ;;;*** ;;;### (autoloads (vc-rcs-master-templates) "vc-rcs" "vc/vc-rcs.el" -;;;;;; (20119 34052)) +;;;;;; (20161 61915)) ;;; Generated autoloads from vc/vc-rcs.el (defvar vc-rcs-master-templates (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) "\ @@ -31063,7 +31082,7 @@ ;;;*** -;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (20119 34052)) +;;;### (autoloads nil "vc-svn" "vc/vc-svn.el" (20163 6516)) ;;; Generated autoloads from vc/vc-svn.el (defun vc-svn-registered (f) (let ((admin-dir (cond ((and (eq system-type 'windows-nt) @@ -31135,7 +31154,7 @@ ;;;*** ;;;### (autoloads (verilog-mode) "verilog-mode" "progmodes/verilog-mode.el" -;;;;;; (20119 34052)) +;;;;;; (20173 62431)) ;;; Generated autoloads from progmodes/verilog-mode.el (autoload 'verilog-mode "verilog-mode" "\ @@ -31272,7 +31291,7 @@ ;;;*** ;;;### (autoloads (vhdl-mode) "vhdl-mode" "progmodes/vhdl-mode.el" -;;;;;; (20127 25049)) +;;;;;; (20168 40835)) ;;; Generated autoloads from progmodes/vhdl-mode.el (autoload 'vhdl-mode "vhdl-mode" "\ @@ -31724,10 +31743,10 @@ PRINTING: - Postscript printing with different faces (an optimized set of faces is + PostScript printing with different faces (an optimized set of faces is used if `vhdl-print-customize-faces' is non-nil) or colors (if `ps-print-color-p' is non-nil) is possible using the standard Emacs - postscript printing commands. Option `vhdl-print-two-column' defines + PostScript printing commands. Option `vhdl-print-two-column' defines appropriate default settings for nice landscape two-column printing. The paper format can be set by option `ps-paper-type'. Do not forget to switch `ps-print-color-p' to nil for printing on black-and-white @@ -31916,7 +31935,7 @@ ;;;;;; view-mode view-buffer-other-frame view-buffer-other-window ;;;;;; view-buffer view-file-other-frame view-file-other-window ;;;;;; view-file kill-buffer-if-not-modified view-remove-frame-by-deleting) -;;;;;; "view" "view.el" (20126 50686)) +;;;;;; "view" "view.el" (20173 62431)) ;;; Generated autoloads from view.el (defvar view-remove-frame-by-deleting t "\ @@ -32175,7 +32194,7 @@ ;;;*** ;;;### (autoloads (viper-mode toggle-viper-mode) "viper" "emulation/viper.el" -;;;;;; (20119 34052)) +;;;;;; (20167 36027)) ;;; Generated autoloads from emulation/viper.el (autoload 'toggle-viper-mode "viper" "\ @@ -32282,7 +32301,7 @@ ;;;*** ;;;### (autoloads (wdired-change-to-wdired-mode) "wdired" "wdired.el" -;;;;;; (20119 34052)) +;;;;;; (20173 62431)) ;;; Generated autoloads from wdired.el (autoload 'wdired-change-to-wdired-mode "wdired" "\ @@ -32298,7 +32317,7 @@ ;;;*** -;;;### (autoloads (webjump) "webjump" "net/webjump.el" (20119 34052)) +;;;### (autoloads (webjump) "webjump" "net/webjump.el" (20161 61915)) ;;; Generated autoloads from net/webjump.el (autoload 'webjump "webjump" "\ @@ -32348,7 +32367,7 @@ ;;;### (autoloads (whitespace-report-region whitespace-report whitespace-cleanup-region ;;;;;; whitespace-cleanup global-whitespace-toggle-options whitespace-toggle-options ;;;;;; global-whitespace-newline-mode global-whitespace-mode whitespace-newline-mode -;;;;;; whitespace-mode) "whitespace" "whitespace.el" (20142 405)) +;;;;;; whitespace-mode) "whitespace" "whitespace.el" (20177 52156)) ;;; Generated autoloads from whitespace.el (autoload 'whitespace-mode "whitespace" "\ @@ -32773,8 +32792,8 @@ ;;;*** ;;;### (autoloads (widget-setup widget-insert widget-delete widget-create -;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (20119 -;;;;;; 34052)) +;;;;;; widget-prompt-value widgetp) "wid-edit" "wid-edit.el" (20163 +;;;;;; 6516)) ;;; Generated autoloads from wid-edit.el (autoload 'widgetp "wid-edit" "\ @@ -32817,8 +32836,8 @@ ;;;*** ;;;### (autoloads (windmove-default-keybindings windmove-down windmove-right -;;;;;; windmove-up windmove-left) "windmove" "windmove.el" (20119 -;;;;;; 34052)) +;;;;;; windmove-up windmove-left) "windmove" "windmove.el" (20161 +;;;;;; 61915)) ;;; Generated autoloads from windmove.el (autoload 'windmove-left "windmove" "\ @@ -32890,7 +32909,7 @@ ;;;*** ;;;### (autoloads (woman-bookmark-jump woman-find-file woman-dired-find-file -;;;;;; woman woman-locale) "woman" "woman.el" (20119 34052)) +;;;;;; woman woman-locale) "woman" "woman.el" (20168 40835)) ;;; Generated autoloads from woman.el (defvar woman-locale nil "\ @@ -33051,7 +33070,7 @@ ;;;*** -;;;### (autoloads (xesam-search) "xesam" "net/xesam.el" (20127 25788)) +;;;### (autoloads (xesam-search) "xesam" "net/xesam.el" (20175 42237)) ;;; Generated autoloads from net/xesam.el (autoload 'xesam-search "xesam" "\ @@ -33071,7 +33090,7 @@ ;;;*** ;;;### (autoloads (xml-parse-region xml-parse-file) "xml" "xml.el" -;;;;;; (20119 34052)) +;;;;;; (20168 40835)) ;;; Generated autoloads from xml.el (autoload 'xml-parse-file "xml" "\ @@ -33397,8 +33416,8 @@ ;;;;;; "vc/ediff-init.el" "vc/ediff-merg.el" "vc/ediff-ptch.el" ;;;;;; "vc/ediff-vers.el" "vc/ediff-wind.el" "vc/pcvs-info.el" "vc/pcvs-parse.el" ;;;;;; "vc/pcvs-util.el" "vc/vc-dav.el" "vcursor.el" "vt-control.el" -;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (20142 -;;;;;; 850 416521)) +;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (20182 +;;;;;; 21665 750715)) ;;;*** === modified file 'msdos/sed2v2.inp' --- msdos/sed2v2.inp 2011-10-31 02:25:01 +0000 +++ msdos/sed2v2.inp 2011-11-30 16:23:05 +0000 @@ -59,7 +59,7 @@ /^#undef PACKAGE_STRING/s/^.*$/#define PACKAGE_STRING ""/ /^#undef PACKAGE_TARNAME/s/^.*$/#define PACKAGE_TARNAME ""/ /^#undef PACKAGE_VERSION/s/^.*$/#define PACKAGE_VERSION ""/ -/^#undef VERSION/s/^.*$/#define VERSION "24.0.91"/ +/^#undef VERSION/s/^.*$/#define VERSION "24.0.92"/ /^#undef HAVE_DECL_GETENV/s/^.*$/#define HAVE_DECL_GETENV 1/ /^#undef SYS_SIGLIST_DECLARED/s/^.*$/#define SYS_SIGLIST_DECLARED 1/ /^#undef HAVE_DIRENT_H/s/^.*$/#define HAVE_DIRENT_H 1/ === modified file 'nextstep/Cocoa/Emacs.base/Contents/Info.plist' --- nextstep/Cocoa/Emacs.base/Contents/Info.plist 2011-10-31 02:25:01 +0000 +++ nextstep/Cocoa/Emacs.base/Contents/Info.plist 2011-11-30 16:23:05 +0000 @@ -553,7 +553,7 @@ CFBundleExecutable Emacs CFBundleGetInfoString - Emacs 24.0.91 Copyright (C) 2011 Free Software Foundation, Inc. + Emacs 24.0.92 Copyright (C) 2011 Free Software Foundation, Inc. CFBundleIconFile Emacs.icns CFBundleIdentifier @@ -566,7 +566,7 @@ APPL CFBundleShortVersionString - 24.0.91 + 24.0.92 CFBundleSignature EMAx === modified file 'nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings' --- nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings 2011-10-31 02:25:01 +0000 +++ nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings 2011-11-30 16:23:05 +0000 @@ -1,6 +1,6 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Emacs"; -CFBundleShortVersionString = "Version 24.0.91"; -CFBundleGetInfoString = "Emacs version 24.0.91, NS Windowing"; +CFBundleShortVersionString = "Version 24.0.92"; +CFBundleGetInfoString = "Emacs version 24.0.92, NS Windowing"; NSHumanReadableCopyright = "Copyright (C) 2011 Free Software Foundation, Inc."; === modified file 'nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop' --- nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop 2011-10-31 02:25:01 +0000 +++ nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop 2011-11-30 16:23:05 +0000 @@ -1,7 +1,7 @@ [Desktop Entry] Encoding=UTF-8 Type=Application -Version=24.0.91 +Version=24.0.92 Categories=GNUstep Name=Emacs Comment=GNU Emacs for NeXT/Open/GNUstep and OS X === modified file 'nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist' --- nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist 2011-10-31 02:25:01 +0000 +++ nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist 2011-11-30 16:23:05 +0000 @@ -2,7 +2,7 @@ ApplicationDescription = "GNU Emacs for GNUstep / OS X"; ApplicationIcon = emacs.tiff; ApplicationName = Emacs; - ApplicationRelease = "24.0.91"; + ApplicationRelease = "24.0.92"; Authors = ( "Adrian Robert (GNUstep)", "Christophe de Dinechin (MacOS X)", @@ -13,7 +13,7 @@ ); Copyright = "Copyright (C) 2011 Free Software Foundation, Inc."; CopyrightDescription = "Released under the GNU General Public License Version 3 or later"; - FullVersionID = "Emacs 24.0.91, NS Windowing"; + FullVersionID = "Emacs 24.0.92, NS Windowing"; NSExecutable = Emacs; NSIcon = emacs.tiff; NSPrincipalClass = NSApplication; === modified file 'nt/config.nt' --- nt/config.nt 2011-11-27 18:52:53 +0000 +++ nt/config.nt 2011-11-30 16:23:05 +0000 @@ -328,7 +328,7 @@ #define PACKAGE "emacs" /* Version number of package */ -#define VERSION "24.0.91" +#define VERSION "24.0.92" /* Define to `__inline__' or `__inline' if that's what the C compiler calls it, or to nothing if 'inline' is not supported under any name. */ === modified file 'nt/emacs.rc' --- nt/emacs.rc 2011-10-31 02:25:01 +0000 +++ nt/emacs.rc 2011-11-30 16:23:05 +0000 @@ -7,8 +7,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 24,0,91,0 - PRODUCTVERSION 24,0,91,0 + FILEVERSION 24,0,92,0 + PRODUCTVERSION 24,0,92,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -25,12 +25,12 @@ BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU Emacs: The extensible self-documenting text editor\0" - VALUE "FileVersion", "24, 0, 91, 0\0" + VALUE "FileVersion", "24, 0, 92, 0\0" VALUE "InternalName", "Emacs\0" VALUE "LegalCopyright", "Copyright (C) 2001-2011\0" VALUE "OriginalFilename", "emacs.exe" VALUE "ProductName", "Emacs\0" - VALUE "ProductVersion", "24, 0, 91, 0\0" + VALUE "ProductVersion", "24, 0, 92, 0\0" VALUE "OLESelfRegister", "\0" END END === modified file 'nt/emacsclient.rc' --- nt/emacsclient.rc 2011-10-31 02:25:01 +0000 +++ nt/emacsclient.rc 2011-11-30 16:23:05 +0000 @@ -5,8 +5,8 @@ #endif VS_VERSION_INFO VERSIONINFO - FILEVERSION 24,0,91,0 - PRODUCTVERSION 24,0,91,0 + FILEVERSION 24,0,92,0 + PRODUCTVERSION 24,0,92,0 FILEFLAGSMASK 0x3FL #ifdef EMACSDEBUG FILEFLAGS 0x1L @@ -23,12 +23,12 @@ BEGIN VALUE "CompanyName", "Free Software Foundation\0" VALUE "FileDescription", "GNU EmacsClient: Client for the extensible self-documenting text editor\0" - VALUE "FileVersion", "24, 0, 91, 0\0" + VALUE "FileVersion", "24, 0, 92, 0\0" VALUE "InternalName", "EmacsClient\0" VALUE "LegalCopyright", "Copyright (C) 2001-2011\0" VALUE "OriginalFilename", "emacsclientw.exe" VALUE "ProductName", "EmacsClient\0" - VALUE "ProductVersion", "24, 0, 91, 0\0" + VALUE "ProductVersion", "24, 0, 92, 0\0" VALUE "OLESelfRegister", "\0" END END === modified file 'nt/makefile.w32-in' --- nt/makefile.w32-in 2011-11-05 11:34:56 +0000 +++ nt/makefile.w32-in 2011-11-30 16:23:05 +0000 @@ -22,7 +22,7 @@ # FIXME: This file uses DOS EOLs. Convert to Unix after 22.1 is out # (and remove or replace this comment). -VERSION = 24.0.91 +VERSION = 24.0.92 TMP_DIST_DIR = emacs-$(VERSION) ------------------------------------------------------------ revno: 106558 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-11-30 23:43:33 +0800 message: Fix typo in comment. diff: === modified file 'lib-src/emacsclient.c' --- lib-src/emacsclient.c 2011-11-30 08:13:05 +0000 +++ lib-src/emacsclient.c 2011-11-30 15:43:33 +0000 @@ -1637,7 +1637,7 @@ { #ifndef WINDOWSNT /* This is defined in stdlib.h on MS-Windows. It's defined in - unisted.h on some POSIX hosts, but not all (Bug#10155). */ + unistd.h on some POSIX hosts, but not all (Bug#10155). */ extern char **environ; #endif int i; ------------------------------------------------------------ revno: 106557 committer: Stefan Monnier branch nick: trunk timestamp: Wed 2011-11-30 09:52:08 -0500 message: * lisp/gnus/message.el (message-pop-to-buffer): Revert 2011-09-11 change. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-11-30 01:07:46 +0000 +++ lisp/gnus/ChangeLog 2011-11-30 14:52:08 +0000 @@ -1,3 +1,7 @@ +2011-11-30 Stefan Monnier + + * message.el (message-pop-to-buffer): Revert 2011-09-11 change. + 2011-11-30 Katsumi Yamaoka * gnus-art.el (gnus-article-browse-html-parts): Convert link file names === modified file 'lisp/gnus/message.el' --- lisp/gnus/message.el 2011-11-20 07:30:16 +0000 +++ lisp/gnus/message.el 2011-11-30 14:52:08 +0000 @@ -6322,6 +6322,7 @@ (defun message-pop-to-buffer (name &optional switch-function) "Pop to buffer NAME, and warn if it already exists and is modified." + (unless switch-function (setq switch-function #'pop-to-buffer)) (let ((buffer (get-buffer name))) (if (and buffer (buffer-name buffer)) @@ -6331,7 +6332,7 @@ (progn (gnus-select-frame-set-input-focus (window-frame window)) (select-window window)) - (funcall (or switch-function 'switch-to-buffer) buffer) + (funcall switch-function buffer) (set-buffer buffer)) (when (and (buffer-modified-p) (not (prog1 @@ -6339,7 +6340,7 @@ "Message already being composed; erase? ") (message nil)))) (error "Message being composed"))) - (funcall (or switch-function 'switch-to-buffer) name) + (funcall switch-function name) (set-buffer name)) (erase-buffer) (message-mode))) ------------------------------------------------------------ revno: 106556 committer: Juanma Barranquero branch nick: trunk timestamp: Wed 2011-11-30 13:58:42 +0100 message: src/dispnew.c (adjust_glyph_matrix) [XASSERTS]: Add missing check. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-30 12:25:09 +0000 +++ src/ChangeLog 2011-11-30 12:58:42 +0000 @@ -1,3 +1,7 @@ +2011-11-30 Juanma Barranquero + + * dispnew.c (adjust_glyph_matrix) [XASSERTS]: Add missing check. + 2011-11-30 Eli Zaretskii * dispnew.c (adjust_glyph_matrix) [XASSERTS]: Ensure ROW's === modified file 'src/dispnew.c' --- src/dispnew.c 2011-11-30 12:25:09 +0000 +++ src/dispnew.c 2011-11-30 12:58:42 +0000 @@ -610,7 +610,7 @@ } #if XASSERTS if (row->enabled_p && !row->mode_line_p) - verify_row_hash (row)); + xassert (verify_row_hash (row)); #endif ++row; } ------------------------------------------------------------ revno: 106555 fixes bug(s): http://debbugs.gnu.org/10164 committer: Eli Zaretskii branch nick: trunk timestamp: Wed 2011-11-30 07:25:09 -0500 message: Fix bug #10164 with assertion violations in linum-mode. src/dispnew.c (adjust_glyph_matrix) [XASSERTS]: Ensure ROW's attributes are tested _before_ calling verify_row_hash, to protect against GCC re-ordering of the tests. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-11-29 18:08:53 +0000 +++ src/ChangeLog 2011-11-30 12:25:09 +0000 @@ -1,3 +1,9 @@ +2011-11-30 Eli Zaretskii + + * dispnew.c (adjust_glyph_matrix) [XASSERTS]: Ensure ROW's + attributes are tested _before_ calling verify_row_hash, to protect + against GCC re-ordering of the tests. (Bug#10164) + 2011-11-29 Jan Djärv * xterm.h (struct x_output): net_wm_state_hidden_seen is new. === modified file 'src/dispnew.c' --- src/dispnew.c 2011-11-28 01:07:01 +0000 +++ src/dispnew.c 2011-11-30 12:25:09 +0000 @@ -608,9 +608,10 @@ row->glyphs[LAST_AREA] = row->glyphs[LEFT_MARGIN_AREA] + dim.width; } - xassert (!row->enabled_p - || row->mode_line_p - || verify_row_hash (row)); +#if XASSERTS + if (row->enabled_p && !row->mode_line_p) + verify_row_hash (row)); +#endif ++row; } } ------------------------------------------------------------ revno: 106554 committer: Chong Yidong branch nick: trunk timestamp: Wed 2011-11-30 16:13:05 +0800 message: * emacsclient.c (main): Condition last change on WINDOWSNT (Bug#10155). diff: === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2011-11-27 18:52:53 +0000 +++ lib-src/ChangeLog 2011-11-30 08:13:05 +0000 @@ -1,3 +1,8 @@ +2011-11-30 Chong Yidong + + * emacsclient.c (main): Condition last change on WINDOWSNT + (Bug#10155). + 2011-11-27 Eli Zaretskii * makefile.w32-in (LOCAL_FLAGS): Add $(EMACS_EXTRA_C_FLAGS). === modified file 'lib-src/emacsclient.c' --- lib-src/emacsclient.c 2011-11-27 18:52:53 +0000 +++ lib-src/emacsclient.c 2011-11-30 08:13:05 +0000 @@ -1635,6 +1635,11 @@ /* Send over our environment and current directory. */ if (!current_frame) { +#ifndef WINDOWSNT + /* This is defined in stdlib.h on MS-Windows. It's defined in + unisted.h on some POSIX hosts, but not all (Bug#10155). */ + extern char **environ; +#endif int i; for (i = 0; environ[i]; i++) { ------------------------------------------------------------ revno: 106553 committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2011-11-30 06:05:47 +0000 message: gnus-art.el (gnus-article-browse-html-parts): Fix previous commit. diff: === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2011-11-30 01:07:46 +0000 +++ lisp/gnus/gnus-art.el 2011-11-30 06:05:47 +0000 @@ -2880,12 +2880,13 @@ gnus-article-mime-handles) cid-dir)) (when (eq system-type 'cygwin) - (setq cid-file (substring - (with-output-to-string - (call-process "cygpath" nil - standard-output - nil "-m" cid-file)) - 0 -1))) + (setq cid-file + (concat "/" (substring + (with-output-to-string + (call-process "cygpath" nil + standard-output + nil "-m" cid-file)) + 0 -1)))) (replace-match (concat "file://" cid-file) nil nil nil 1)))) (unless content (setq content (buffer-string))))