Now on revision 112204. ------------------------------------------------------------ revno: 112204 committer: Jay Belanger branch nick: trunk timestamp: Sun 2013-03-31 15:27:40 -0500 message: * doc/misc/calc.texi (Basic Operations on Units): Streamline some descriptions. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2013-03-30 19:31:27 +0000 +++ doc/misc/ChangeLog 2013-03-31 20:27:40 +0000 @@ -1,3 +1,8 @@ +2013-03-31 Jay Belanger + + * calc.texi: (Basic Operations on Units): Streamline some + descriptions. + 2013-03-27 Aidan Gauland * eshell.texi (Built-ins): Update manual to mention tramp module. === modified file 'doc/misc/calc.texi' --- doc/misc/calc.texi 2013-03-09 23:36:02 +0000 +++ doc/misc/calc.texi 2013-03-31 20:27:40 +0000 @@ -27911,11 +27911,10 @@ to have, then for the new units. (If the value on the stack can be simplified so that it doesn't contain any units, like @samp{ft/in} can be simplified to 12, then @kbd{u c} will still prompt for both old -units and new units. This can be disabled; @pxref{Customizing Calc}.) -Assuming the old and new units you give are consistent with each -other, the result also will not contain any units. For example, -@kbd{@w{u c} cm @key{RET} in @key{RET}} converts the number 2 on the -stack to 5.08. +units and new units. Assuming the old and new units you give are +consistent with each other, the result also will not contain any +units. For example, @kbd{@w{u c} cm @key{RET} in @key{RET}} converts +the number 2 on the stack to 5.08. @kindex u b @pindex calc-base-units @@ -35694,17 +35693,6 @@ is @code{nil}. @end defvar -@defvar calc-allow-units-as-numbers -When converting units, the variable @code{calc-allow-units-as-numbers} -determines whether or not values which can be simplified so that -they don't contain units (such as @samp{ft/in} can be simplified to 12) -can be regarded as not containing units. If -@code{calc-allow-units-as-numbers} is non-@code{nil}, then @kbd{u c} -will prompt for both old units and new units when converting an expression -like @samp{ft/in}, otherwise @kbd{u c} will only prompt for the new units. -The default value of @code{calc-allow-units-as-numbers} is @code{t}. -@end defvar - @defvar calc-undo-length The variable @code{calc-undo-length} determines the number of undo steps that Calc will keep track of when @code{calc-quit} is called. ------------------------------------------------------------ revno: 112203 committer: Glenn Morris branch nick: trunk timestamp: Sun 2013-03-31 10:18:09 -0700 message: More details of X-Debbugs-Envelope-To diff: === modified file 'admin/notes/bugtracker' --- admin/notes/bugtracker 2012-10-13 19:39:42 +0000 +++ admin/notes/bugtracker 2013-03-31 17:18:09 +0000 @@ -627,7 +627,9 @@ 1) The leading envelope From line. 2) Message-ID (get it from /var/log/mailman/vette). -3) X-Debbugs-Envelope-To: submit +3) X-Debbugs-Envelope-To: xxx +For a new report, xxx = submit; for a control message, xxx = control; +for a reply to bug#123, xxx = 123 Then pipe it to receive as above. ------------------------------------------------------------ revno: 112202 committer: Roland Winkler branch nick: trunk timestamp: Sun 2013-03-31 10:19:19 -0500 message: emacs-lisp/crm.el (completing-read-multiple): Doc fix. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-31 13:34:35 +0000 +++ lisp/ChangeLog 2013-03-31 15:19:19 +0000 @@ -1,3 +1,7 @@ +2013-03-31 Roland Winkler + + * emacs-lisp/crm.el (completing-read-multiple): Doc fix. + 2013-03-31 Stefan Monnier * hi-lock.el (hi-lock-mode): Cleanup after revert-buffer (bug#13891). === modified file 'lisp/emacs-lisp/crm.el' --- lisp/emacs-lisp/crm.el 2013-03-17 10:33:57 +0000 +++ lisp/emacs-lisp/crm.el 2013-03-31 15:19:19 +0000 @@ -263,7 +263,8 @@ contents of the minibuffer are 'alice,bob,eve' and point is between 'l' and 'i', pressing TAB operates on the element 'alice'. -The return value of this function is a list of the read strings. +The return value of this function is a list of the read strings +with empty strings removed. See the documentation for `completing-read' for details on the arguments: PROMPT, TABLE, PREDICATE, REQUIRE-MATCH, INITIAL-INPUT, HIST, DEF, and @@ -287,7 +288,7 @@ prompt initial-input map nil hist def inherit-input-method))) (and def (string-equal input "") (setq input def)) - ;; Ignore empty strings in the list of return values. + ;; Remove empty strings in the list of read strings. (split-string input crm-separator t))) (remove-hook 'choose-completion-string-functions 'crm--choose-completion-string))) ------------------------------------------------------------ revno: 112201 fixes bug: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=13891 committer: Stefan Monnier branch nick: trunk timestamp: Sun 2013-03-31 09:34:35 -0400 message: * lisp/hi-lock.el (hi-lock-mode): Cleanup after revert-buffer. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-03-30 19:31:27 +0000 +++ lisp/ChangeLog 2013-03-31 13:34:35 +0000 @@ -1,3 +1,7 @@ +2013-03-31 Stefan Monnier + + * hi-lock.el (hi-lock-mode): Cleanup after revert-buffer (bug#13891). + 2013-03-30 Fabián Ezequiel Gallina Un-indent after "pass" and "return" statements (Bug#13888) === modified file 'lisp/hi-lock.el' --- lisp/hi-lock.el 2013-03-08 04:18:16 +0000 +++ lisp/hi-lock.el 2013-03-31 13:34:35 +0000 @@ -389,7 +389,9 @@ (define-key-after menu-bar-edit-menu [hi-lock] (cons "Regexp Highlighting" hi-lock-menu)) (hi-lock-find-patterns) - (add-hook 'font-lock-mode-hook 'hi-lock-font-lock-hook nil t)) + (add-hook 'font-lock-mode-hook 'hi-lock-font-lock-hook nil t) + ;; Remove regexps from font-lock-keywords (bug#13891). + (add-hook 'change-major-mode-hook (lambda () (hi-lock-mode -1)) nil t)) ;; Turned off. (when (or hi-lock-interactive-patterns hi-lock-file-patterns) ------------------------------------------------------------ revno: 112200 author: Andrew Cohen committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2013-03-31 12:48:07 +0000 message: lisp/gnus/nnir.el (nnir-method-default-engines): Fix typo diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-03-30 11:40:32 +0000 +++ lisp/gnus/ChangeLog 2013-03-31 12:48:07 +0000 @@ -1,3 +1,7 @@ +2013-03-31 Andrew Cohen + + * nnir.el (nnir-method-default-engines): And another typo. + 2013-03-30 Andrew Cohen * nnir.el (nnir-method-default-engines): Fix typo. === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2013-03-30 11:40:32 +0000 +++ lisp/gnus/nnir.el 2013-03-31 12:48:07 +0000 @@ -588,7 +588,7 @@ "*Alist of default search engines keyed by server method." :version "24.1" :group 'nnir - :type `(repeat (cons (choice (const nnimap) (const nttp) (const nnspool) + :type `(repeat (cons (choice (const nnimap) (const nntp) (const nnspool) (const nneething) (const nndir) (const nnmbox) (const nnml) (const nnmh) (const nndraft) (const nnfolder) (const nnmaildir)) ------------------------------------------------------------ revno: 112199 committer: Glenn Morris branch nick: trunk timestamp: Sun 2013-03-31 06:17:42 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/configure' --- autogen/configure 2013-03-27 10:17:37 +0000 +++ autogen/configure 2013-03-31 10:17:42 +0000 @@ -23965,8 +23965,9 @@ #if \ (__GNUC__ || __IBMC__ || __IBMCPP__ \ || 0x5110 <= __SUNPRO_C || 1300 <= _MSC_VER) - int alignas (8) alignas_int = 1; - char test_alignas[_Alignof (alignas_int) == 8 ? 1 : -1]; + struct alignas_test { char c; char alignas (8) alignas_8; }; + char test_alignas[offsetof (struct alignas_test, alignas_8) == 8 + ? 1 : -1]; #endif int ------------------------------------------------------------ revno: 112198 committer: Dmitry Antipov branch nick: trunk timestamp: Sun 2013-03-31 09:45:54 +0400 message: * frame.h (struct frame): Drop scroll_bottom_vpos member becaue all real users are dead long ago. (FRAME_SCROLL_BOTTOM_VPOS): Remove. * xdisp.c (redisplay_internal): Adjust user. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-03-30 16:57:02 +0000 +++ src/ChangeLog 2013-03-31 05:45:54 +0000 @@ -1,3 +1,10 @@ +2013-03-31 Dmitry Antipov + + * frame.h (struct frame): Drop scroll_bottom_vpos + member becaue all real users are dead long ago. + (FRAME_SCROLL_BOTTOM_VPOS): Remove. + * xdisp.c (redisplay_internal): Adjust user. + 2013-03-30 Darren Ho (tiny change) * nsmenu.m (showAtX:Y:for:): setLevel to === modified file 'src/frame.h' --- src/frame.h 2013-03-22 12:41:34 +0000 +++ src/frame.h 2013-03-31 05:45:54 +0000 @@ -427,10 +427,6 @@ /* Width of bar cursor (if we are using that) for blink-off state. */ int blink_off_cursor_width; - /* Nonnegative if current redisplay should not do scroll computation - for lines beyond a certain vpos. This is the vpos. */ - int scroll_bottom_vpos; - /* Configured width of the scroll bar, in pixels and in characters. config_scroll_bar_cols tracks config_scroll_bar_width if the latter is positive; a zero value in config_scroll_bar_width means @@ -785,7 +781,6 @@ #define FRAME_DELETE_COST(f) (f)->delete_line_cost #define FRAME_INSERTN_COST(f) (f)->insert_n_lines_cost #define FRAME_DELETEN_COST(f) (f)->delete_n_lines_cost -#define FRAME_SCROLL_BOTTOM_VPOS(f) (f)->scroll_bottom_vpos #define FRAME_FOCUS_FRAME(f) f->focus_frame /* This frame slot says whether scroll bars are currently enabled for frame F, === modified file 'src/xdisp.c' --- src/xdisp.c 2013-03-29 15:50:21 +0000 +++ src/xdisp.c 2013-03-31 05:45:54 +0000 @@ -12948,8 +12948,6 @@ unbind_to (count1, Qnil); - FRAME_SCROLL_BOTTOM_VPOS (XFRAME (w->frame)) = -1; - consider_all_windows_p = (update_mode_lines || buffer_shared_and_changed () || cursor_type_changed);