Now on revision 107636. ------------------------------------------------------------ revno: 107636 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=11051 committer: Stefan Monnier branch nick: trunk timestamp: Tue 2012-03-20 22:13:52 -0400 message: * lisp/wid-edit.el (widget-complete-field): Remove. (widget-complete): Remove broken use of it. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-03-20 15:44:45 +0000 +++ lisp/ChangeLog 2012-03-21 02:13:52 +0000 @@ -1,7 +1,12 @@ +2012-03-21 Stefan Monnier + + * wid-edit.el (widget-complete-field): Remove (bug#11051). + (widget-complete): Remove broken use of it. + 2012-03-20 Chong Yidong - * emacs-lisp/tabulated-list.el (tabulated-list-print-entry): Use - string-width and truncate-string-width to handle arbitrary + * emacs-lisp/tabulated-list.el (tabulated-list-print-entry): + Use string-width and truncate-string-width to handle arbitrary characters. 2012-03-20 Tassilo Horn @@ -17,8 +22,7 @@ 2012-03-18 Leo Liu - * net/rcirc.el (rcirc-cmd-quit): Allow quiting all servers with - prefix. + * net/rcirc.el (rcirc-cmd-quit): Allow quiting all servers with prefix. 2012-03-17 Eli Zaretskii @@ -48,7 +52,7 @@ (hfy-fontify-buffer): Use above handlers. (hfy-face-to-css-default): Same as the earlier `hfy-face-to-css'. (hfy-face-to-css): Re-defined to be a variable. - (hfy-compile-stylesheet): Modified. Allow stylesheet to be built + (hfy-compile-stylesheet): Modify. Allow stylesheet to be built over multiple runs. This is made possible by having the caller let bind a special variable `hfy-user-sheet-assoc'. (htmlfontify-string): New defun. @@ -72,10 +76,8 @@ * progmodes/cc-engine.el (c-crosses-statement-barrier-p): Use a limit to a call of `c-literal-limits'. (c-determine-+ve-limit): New function. - (c-at-macro-vsemi-p): Move `c-in-literal' to the bottom of an - `and'. - (c-guess-basic-syntax): In macros, restrict a search limit to - 2000. + (c-at-macro-vsemi-p): Move `c-in-literal' to the bottom of an `and'. + (c-guess-basic-syntax): In macros, restrict a search limit to 2000. In CASE 5B, restrict a search limit to 500. (c-just-after-func-arglist-p): Obviouly wrong `or' -> `and'. @@ -89,7 +91,7 @@ 2012-03-16 Aaron S. Hawley * tar-mode.el (tar-mode): Fix saving by conditionally undoing - `special-mode' setting of `buffer-read-only'. (Bug#11010) + `special-mode' setting of `buffer-read-only'. (Bug#11010) 2012-03-16 Glenn Morris @@ -156,8 +158,7 @@ 2012-03-12 Leo Liu - * simple.el (kill-new): Use equal-including-properties for - comparison. + * simple.el (kill-new): Use equal-including-properties for comparison. (kill-do-not-save-duplicates): Doc fix. 2012-03-12 Stefan Monnier @@ -239,8 +240,7 @@ * net/mairix.el (mairix-replace-invalid-chars): Rename from mairix-replace-illegal-chars; all callers changed. Don't remove - ^, ~, and = characters: they are meaningful in mairix search - specs. + ^, ~, and = characters: they are meaningful in mairix search specs. (mairix-widget-create-query): Add usage information about mairix search forms: negating words, searching for substrings, etc. @@ -425,8 +425,7 @@ 2012-03-04 Chong Yidong - * cus-start.el: Make x-select-enable-clipboard-manager - customizable. + * cus-start.el: Make x-select-enable-clipboard-manager customizable. 2012-03-04 Glenn Morris @@ -557,7 +556,7 @@ (font-lock-default-function): Move the check for a specification to font-lock-spec-present. - * font-lock.el (font-lock-initial-fontify): call ... + * font-lock.el (font-lock-initial-fontify): Call ... (font-lock-spec-present): New function. 2012-02-26 Jim Blandy @@ -886,8 +885,7 @@ 2012-02-12 Teodor Zlatanov - * net/gnutls.el (gnutls-algorithm-priority): Add missing :group - tag. + * net/gnutls.el (gnutls-algorithm-priority): Add missing :group tag. 2012-02-12 Alan Mackenzie @@ -1060,8 +1058,8 @@ * progmodes/cc-guess.el (c-guess-offset-threshold, c-guess-region-max): Add :version tags. - * progmodes/compile.el (compilation-first-column) - (compilation-error-screen-columns, compilation-filter-start): Doc fixes. + * progmodes/compile.el (compilation-error-screen-columns) + (compilation-first-column, compilation-filter-start): Doc fixes. * vc/log-view.el (log-view-toggle-entry-display): * vc/vc.el (vc-merge, vc-pull): Doc fixes. === modified file 'lisp/wid-edit.el' --- lisp/wid-edit.el 2012-02-05 15:33:30 +0000 +++ lisp/wid-edit.el 2012-03-21 02:13:52 +0000 @@ -1141,12 +1141,6 @@ (kill-region (point) end) (call-interactively 'kill-line)))) -(defcustom widget-complete-field (lookup-key global-map "\M-\t") - "Default function to call for completion inside fields." - :options '(ispell-complete-word complete-tag lisp-complete-symbol) - :type 'function - :group 'widgets) - (defun widget-narrow-to-field () "Narrow to field." (interactive) @@ -1169,10 +1163,6 @@ (completion-in-region (nth 0 data) (nth 1 data) (nth 2 data) (plist-get completion-extra-properties :predicate)))) - ((widget-field-find (point)) - ;; This defaulting used to be performed in widget-default-complete, but - ;; it seems more appropriate here than in widget-default-completions. - (call-interactively 'widget-complete-field)) (t (error "Not in an editable field"))))) ;; We may want to use widget completion in buffers where the major mode ------------------------------------------------------------ revno: 107635 committer: Eli Zaretskii branch nick: trunk timestamp: Tue 2012-03-20 20:49:18 +0200 message: Doc fixes in w32-specific primitives related to console codepage. src/w32proc.c (Fw32_set_console_codepage) (Fw32_set_console_output_codepage, Fw32_get_codepage_charset): Doc fixes. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2012-03-20 08:52:11 +0000 +++ src/ChangeLog 2012-03-20 18:49:18 +0000 @@ -1,3 +1,9 @@ +2012-03-20 Eli Zaretskii + + * w32proc.c (Fw32_set_console_codepage) + (Fw32_set_console_output_codepage, Fw32_get_codepage_charset): Doc + fixes. + 2012-03-20 Chong Yidong * dispnew.c (Fredisplay, Vredisplay_preemption_period): Update doc === modified file 'src/w32proc.c' --- src/w32proc.c 2012-01-19 07:21:25 +0000 +++ src/w32proc.c 2012-03-20 18:49:18 +0000 @@ -2067,8 +2067,8 @@ DEFUN ("w32-set-console-codepage", Fw32_set_console_codepage, Sw32_set_console_codepage, 1, 1, 0, - doc: /* Make Windows codepage CP be the current codepage setting for Emacs. -The codepage setting affects keyboard input and display in tty mode. + doc: /* Make Windows codepage CP be the codepage for Emacs tty keyboard input. +This codepage setting affects keyboard input in tty mode. If successful, the new CP is returned, otherwise nil. */) (Lisp_Object cp) { @@ -2095,8 +2095,8 @@ DEFUN ("w32-set-console-output-codepage", Fw32_set_console_output_codepage, Sw32_set_console_output_codepage, 1, 1, 0, - doc: /* Make Windows codepage CP be the current codepage setting for Emacs. -The codepage setting affects keyboard input and display in tty mode. + doc: /* Make Windows codepage CP be the codepage for Emacs console output. +This codepage setting affects display in tty mode. If successful, the new CP is returned, otherwise nil. */) (Lisp_Object cp) { @@ -2114,7 +2114,7 @@ DEFUN ("w32-get-codepage-charset", Fw32_get_codepage_charset, Sw32_get_codepage_charset, 1, 1, 0, - doc: /* Return charset of codepage CP. + doc: /* Return charset ID corresponding to codepage CP. Returns nil if the codepage is not valid. */) (Lisp_Object cp) { ------------------------------------------------------------ revno: 107634 committer: Chong Yidong branch nick: trunk timestamp: Tue 2012-03-20 23:44:45 +0800 message: Improve column width calculation in tabulated-list.el. * lisp/emacs-lisp/tabulated-list.el (tabulated-list-print-entry): Use string-width and truncate-string-width to handle arbitrary characters. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-03-20 08:13:11 +0000 +++ lisp/ChangeLog 2012-03-20 15:44:45 +0000 @@ -1,3 +1,9 @@ +2012-03-20 Chong Yidong + + * emacs-lisp/tabulated-list.el (tabulated-list-print-entry): Use + string-width and truncate-string-width to handle arbitrary + characters. + 2012-03-20 Tassilo Horn * textmodes/artist.el (artist-menu-map): Bind Rectangle menu item === modified file 'lisp/emacs-lisp/tabulated-list.el' --- lisp/emacs-lisp/tabulated-list.el 2012-01-26 06:30:49 +0000 +++ lisp/emacs-lisp/tabulated-list.el 2012-03-20 15:44:45 +0000 @@ -278,11 +278,10 @@ (width (nth 1 format)) (label (if (stringp desc) desc (car desc))) (help-echo (concat (car format) ": " label))) - ;; Truncate labels if necessary. - (and (> width 6) - (> (length label) width) - (setq label (concat (substring label 0 (- width 3)) - "..."))) + ;; Truncate labels if necessary (except last column). + (and (< (1+ n) len) + (> (string-width label) width) + (setq label (truncate-string-to-width label width nil nil t))) (setq label (bidi-string-mark-left-to-right label)) (if (stringp desc) (insert (propertize label 'help-echo help-echo)) ------------------------------------------------------------ revno: 107633 committer: Chong Yidong branch nick: trunk timestamp: Tue 2012-03-20 16:52:11 +0800 message: Update doc to reflect new non-nil value of redisplay-dont-pause. * doc/lispref/display.texi (Forcing Redisplay): Various rewrites to reflect new value of redisplay-dont-pause. (Truncation): Copyedits. * src/dispnew.c (Fredisplay, Vredisplay_preemption_period): Update doc to reflect default non-nil value of redisplay-dont-pause. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2012-03-20 07:44:03 +0000 +++ doc/lispref/ChangeLog 2012-03-20 08:52:11 +0000 @@ -1,3 +1,9 @@ +2012-03-20 Chong Yidong + + * display.texi (Forcing Redisplay): Various rewrites to reflect + new value of redisplay-dont-pause. + (Truncation): Copyedits. + 2012-03-20 Glenn Morris * os.texi (Startup Summary): Don't mention initial-buffer-choice = t. === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2012-03-11 16:10:07 +0000 +++ doc/lispref/display.texi 2012-03-20 08:52:11 +0000 @@ -86,60 +86,58 @@ waiting for input. @defun redisplay &optional force -This function tries immediately to redisplay, provided there are no -pending input events. - -If the optional argument @var{force} is non-@code{nil}, it does all -pending redisplay work even if input is available, with no -pre-emption. +This function tries immediately to redisplay. The optional argument +@var{force}, if non-@code{nil}, forces the redisplay to be performed, +instead of being preempted, even if input is pending and the variable +@code{redisplay-dont-pause} is @code{nil} (see below). If +@code{redisplay-dont-pause} is non-@code{nil} (the default), this +function redisplays in any case, i.e.@: @var{force} does nothing. The function returns @code{t} if it actually tried to redisplay, and @code{nil} otherwise. A value of @code{t} does not mean that -redisplay proceeded to completion; it could have been pre-empted by -newly arriving terminal input. -@end defun - - @code{redisplay} with no argument tries immediately to redisplay, -but has no effect on the usual rules for what parts of the screen to -redisplay. By contrast, the following function adds certain windows -to the pending redisplay work (as if their contents had completely -changed), but doesn't immediately try to do any redisplay work. - -@defun force-window-update &optional object -This function forces some or all windows to be updated on next -redisplay. If @var{object} is a window, it requires eventual -redisplay of that window. If @var{object} is a buffer or buffer name, -it requires eventual redisplay of all windows displaying that buffer. -If @var{object} is @code{nil} (or omitted), it requires eventual -redisplay of all windows. -@end defun - - @code{force-window-update} does not do a redisplay immediately. -(Emacs will do that when it waits for input.) Rather, its effect is -to put more work on the queue to be done by redisplay whenever there -is a chance. +redisplay proceeded to completion; it could have been preempted by +newly arriving input. +@end defun @defvar redisplay-dont-pause -If this variable is non-@code{nil}, pending input does not prevent or -halt redisplay; redisplay occurs, and finishes, regardless of whether -input is available. If it is @code{nil}, Emacs redisplay stops if -input arrives, and does not happen at all if input is available before -it starts. The default is @code{t}. +If this variable is @code{nil}, arriving input events preempt +redisplay; Emacs avoids starting a redisplay, and stops any redisplay +that is in progress, until the input has been processed. In +particular, @code{(redisplay)} returns @code{nil} without actually +redisplaying, if there is pending input. + +The default value is @code{t}, which means that pending input does not +preempt redisplay. @end defvar @defvar redisplay-preemption-period -This variable specifies how many seconds Emacs waits between checks -for new input during redisplay. (The default is 0.1 seconds.) If -input has arrived when Emacs checks, it pre-empts redisplay and -processes the available input before trying again to redisplay. - -If this variable is @code{nil}, Emacs does not check for input during -redisplay, and redisplay cannot be preempted by input. - -This variable is only obeyed on graphical terminals. For -text terminals, see @ref{Terminal Output}. +If @code{redisplay-dont-pause} is @code{nil}, this variable specifies +how many seconds Emacs waits between checks for new input during +redisplay; if input arrives during this interval, redisplay stops and +the input is processed. The default value is 0.1; if the value is +@code{nil}, Emacs does not check for input during redisplay. + +This variable has no effect when @code{redisplay-dont-pause} is +non-@code{nil} (the default). @end defvar + Although @code{redisplay} tries immediately to redisplay, it does +not change how Emacs decides which parts of its frame(s) to redisplay. +By contrast, the following function adds certain windows to the +pending redisplay work (as if their contents had completely changed), +but does not immediately try to perform redisplay. + +@defun force-window-update &optional object +This function forces some or all windows to be updated the next time +Emacs does a redisplay. If @var{object} is a window, that window is +to be updated. If @var{object} is a buffer or buffer name, all +windows displaying that buffer are to be updated. If @var{object} is +@code{nil} (or omitted), all windows are to be updated. + +This function does not do a redisplay immediately; Emacs does that as +it waits for input, or when the function @code{redisplay} is called. +@end defun + @node Truncation @section Truncation @cindex line wrapping @@ -169,7 +167,7 @@ beyond the right edge of the window are truncated; otherwise, they are continued. As a special exception, the variable @code{truncate-partial-width-windows} takes precedence in -@dfn{partial-width} windows (i.e., windows that do not occupy the +@dfn{partial-width} windows (i.e.@: windows that do not occupy the entire frame width). @end defopt @@ -192,37 +190,37 @@ @defvar wrap-prefix If this buffer-local variable is non-@code{nil}, it defines a -``prefix'' that is prepended to every continuation line at -display time. (If lines are truncated, the wrap-prefix is never -used.) It may be a string or an image (@pxref{Other Display Specs}), -or a stretch of whitespace such as specified by the @code{:width} or -@code{:align-to} display properties (@pxref{Specified Space}). The -value is interpreted in the same way as a @code{display} text -property. @xref{Display Property}. +@dfn{wrap prefix} which Emacs displays at the start of every +continuation line. (If lines are truncated, @code{wrap-prefix} is +never used.) Its value may be a string or an image (@pxref{Other +Display Specs}), or a stretch of whitespace such as specified by the +@code{:width} or @code{:align-to} display properties (@pxref{Specified +Space}). The value is interpreted in the same way as a @code{display} +text property. @xref{Display Property}. -A wrap-prefix may also be specified for regions of text, using the +A wrap prefix may also be specified for regions of text, using the @code{wrap-prefix} text or overlay property. This takes precedence over the @code{wrap-prefix} variable. @xref{Special Properties}. @end defvar @defvar line-prefix If this buffer-local variable is non-@code{nil}, it defines a -``prefix'' that is prepended to every non-continuation line at -display time. It may be a string or an image (@pxref{Other Display -Specs}), or a stretch of whitespace such as specified by the -@code{:width} or @code{:align-to} display properties (@pxref{Specified -Space}). The value is interpreted in the same way as a @code{display} -text property. @xref{Display Property}. +@dfn{line prefix} which Emacs displays at the start of every +non-continuation line. Its value may be a string or an image +(@pxref{Other Display Specs}), or a stretch of whitespace such as +specified by the @code{:width} or @code{:align-to} display properties +(@pxref{Specified Space}). The value is interpreted in the same way +as a @code{display} text property. @xref{Display Property}. -A line-prefix may also be specified for regions of text using the +A line prefix may also be specified for regions of text using the @code{line-prefix} text or overlay property. This takes precedence over the @code{line-prefix} variable. @xref{Special Properties}. @end defvar If your buffer contains @emph{very} long lines, and you use continuation to display them, computing the continuation lines can -make Emacs redisplay slow. The column computation and indentation -functions also become slow. Then you might find it advisable to set +make redisplay slow. The column computation and indentation functions +also become slow. Then you might find it advisable to set @code{cache-long-line-scans} to @code{t}. @defvar cache-long-line-scans === modified file 'src/ChangeLog' --- src/ChangeLog 2012-03-19 04:17:50 +0000 +++ src/ChangeLog 2012-03-20 08:52:11 +0000 @@ -1,3 +1,8 @@ +2012-03-20 Chong Yidong + + * dispnew.c (Fredisplay, Vredisplay_preemption_period): Update doc + to reflect default non-nil value of redisplay-dont-pause. + 2012-03-19 Kenichi Handa * ftfont.c (ftfont_drive_otf): Mask bits of character code to make === modified file 'src/dispnew.c' --- src/dispnew.c 2012-02-04 11:29:29 +0000 +++ src/dispnew.c 2012-03-20 08:52:11 +0000 @@ -6068,10 +6068,14 @@ DEFUN ("redisplay", Fredisplay, Sredisplay, 0, 1, 0, - doc: /* Perform redisplay if no input is available. -If optional arg FORCE is non-nil or `redisplay-dont-pause' is non-nil, -perform a full redisplay even if input is available. -Return t if redisplay was performed, nil otherwise. */) + doc: /* Perform redisplay. +Optional arg FORCE, if non-nil, prevents redisplay from being +preempted by arriving input, even if `redisplay-dont-pause' is nil. +If `redisplay-dont-pause' is non-nil (the default), redisplay is never +preempted by arriving input, so FORCE does nothing. + +Return t if redisplay was performed, nil if redisplay was preempted +immediately by pending input. */) (Lisp_Object force) { int count; @@ -6521,21 +6525,21 @@ DEFSYM (Qredisplay_dont_pause, "redisplay-dont-pause"); DEFVAR_INT ("baud-rate", baud_rate, - doc: /* *The output baud rate of the terminal. + doc: /* The output baud rate of the terminal. On most systems, changing this value will affect the amount of padding and the other strategic decisions made during redisplay. */); DEFVAR_BOOL ("inverse-video", inverse_video, - doc: /* *Non-nil means invert the entire frame display. + doc: /* Non-nil means invert the entire frame display. This means everything is in inverse video which otherwise would not be. */); DEFVAR_BOOL ("visible-bell", visible_bell, - doc: /* *Non-nil means try to flash the frame to represent a bell. + doc: /* Non-nil means try to flash the frame to represent a bell. See also `ring-bell-function'. */); DEFVAR_BOOL ("no-redraw-on-reenter", no_redraw_on_reenter, - doc: /* *Non-nil means no need to redraw entire frame after suspending. + doc: /* Non-nil means no need to redraw entire frame after suspending. A non-nil value is useful if the terminal can automatically preserve Emacs's frame display when you reenter Emacs. It is up to you to set this variable if your terminal can do that. */); @@ -6590,14 +6594,15 @@ Vstandard_display_table = Qnil; DEFVAR_BOOL ("redisplay-dont-pause", redisplay_dont_pause, - doc: /* *Non-nil means display update isn't paused when input is detected. */); + doc: /* Non-nil means display update isn't paused when input is detected. */); redisplay_dont_pause = 1; #if PERIODIC_PREEMPTION_CHECKING DEFVAR_LISP ("redisplay-preemption-period", Vredisplay_preemption_period, - doc: /* *The period in seconds between checking for input during redisplay. -If input is detected, redisplay is pre-empted, and the input is processed. -If nil, never pre-empt redisplay. */); + doc: /* Period in seconds between checking for input during redisplay. +This has an effect only if `redisplay-dont-pause' is nil; in that +case, arriving input preempts redisplay until the input is processed. +If the value is nil, redisplay is never preempted. */); Vredisplay_preemption_period = make_float (0.10); #endif ------------------------------------------------------------ revno: 107632 committer: Tassilo Horn branch nick: trunk timestamp: Tue 2012-03-20 09:13:11 +0100 message: * textmodes/artist.el (artist-menu-map): Bind Rectangle menu item to draw rectangles, not squares. (Regression introduced by revno 103471) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2012-03-18 14:18:01 +0000 +++ lisp/ChangeLog 2012-03-20 08:13:11 +0000 @@ -1,3 +1,9 @@ +2012-03-20 Tassilo Horn + + * textmodes/artist.el (artist-menu-map): Bind Rectangle menu item + to draw rectangles, not squares. (Regression introduced by revno + 103471) + 2012-03-18 Chong Yidong * faces.el (face-spec-reset-face): Don't call display-graphic-p if === modified file 'lisp/textmodes/artist.el' --- lisp/textmodes/artist.el 2012-01-19 07:21:25 +0000 +++ lisp/textmodes/artist.el 2012-03-20 08:13:11 +0000 @@ -535,7 +535,8 @@ ("Text" artist-select-op-text-overwrite text-ovwrt) ("Ellipse" artist-select-op-circle circle) ("Poly-line" artist-select-op-straight-poly-line spolyline) - ("Rectangle" artist-select-op-square square) + ("Square" artist-select-op-square square) + ("Rectangle" artist-select-op-rectangle rectangle) ("Line" artist-select-op-straight-line s-line) ("Pen" artist-select-op-pen-line pen-line))) (define-key map (vector (nth 2 op)) ------------------------------------------------------------ revno: 107631 committer: Glenn Morris branch nick: trunk timestamp: Tue 2012-03-20 00:44:03 -0700 message: os.texi "Startup Summary" small changes * doc/lispref/os.texi (Startup Summary): Don't mention initial-buffer-choice = t. Add summary table of some relevant command-line options. diff: === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2012-03-18 15:02:12 +0000 +++ doc/lispref/ChangeLog 2012-03-20 07:44:03 +0000 @@ -1,3 +1,8 @@ +2012-03-20 Glenn Morris + + * os.texi (Startup Summary): Don't mention initial-buffer-choice = t. + Add summary table of some relevant command-line options. + 2012-03-18 Chong Yidong * internals.texi (Building Emacs, Garbage Collection): Copyedits. === modified file 'doc/lispref/os.texi' --- doc/lispref/os.texi 2012-03-18 15:02:12 +0000 +++ doc/lispref/os.texi 2012-03-20 07:44:03 +0000 @@ -248,6 +248,9 @@ @end enumerate +@noindent +The following options affect some aspects of the startup sequence. + @defopt inhibit-startup-screen This variable, if non-@code{nil}, inhibits the startup screen. In that case, Emacs typically displays the @samp{*scratch*} buffer; but @@ -265,9 +268,13 @@ @defopt initial-buffer-choice This variable, if non-@code{nil}, determines a file or buffer for -Emacs to display after starting up, instead of the startup screen. If -its value is @code{t}, Emacs displays the @samp{*scratch*} buffer. If -its value is a string, that specifies the name of a file for Emacs to +Emacs to display after starting up, instead of the startup screen. +@ignore +@c I do not think this should be mentioned. AFAICS it is just a dodge +@c around inhibit-startup-screen not being settable on a site-wide basis. +If its value is @code{t}, Emacs displays the @samp{*scratch*} buffer. +@end ignore +If its value is a string, that specifies the name of a file for Emacs to visit. @end defopt @@ -283,7 +290,7 @@ Emacs explicitly checks for an expression as shown above in your init file; your login name must appear in the expression as a Lisp string -constant. Other methods of setting +constant. You can also use the Custom interface. Other methods of setting @code{inhibit-startup-echo-area-message} to the same value do not inhibit the startup message. This way, you can easily inhibit the message for yourself if you wish, but thoughtless copying of your init @@ -296,6 +303,34 @@ is @code{nil}, the @samp{*scratch*} buffer is empty. @end defopt +@noindent +The following command-line options affect some aspects of the startup +sequence. @xref{Initial Options,,, emacs, The GNU Emacs Manual}. + +@table @code +@item --no-splash +Do not display a splash screen. + +@item --batch +Run without an interactive terminal. @xref{Batch Mode}. + +@item --daemon +Do not initialize any display; just start a server in the background. + +@item --no-init-file +@itemx -Q +Do not load either the init file, or the @file{default} library. + +@item --no-site-file +Do not load the @file{site-start} library. + +@item --quick +@itemx -Q +Equivalent to @samp{-q --no-site-file --no-splash}. +@c and --no-site-lisp, but let's not mention that here. +@end table + + @node Init File @subsection The Init File @cindex init file ------------------------------------------------------------ revno: 107630 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2012-03-19 14:44:14 +0000 message: shr.el (shr-insert): Minor shr white space rendering tweak diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2012-03-14 22:15:04 +0000 +++ lisp/gnus/ChangeLog 2012-03-19 14:44:14 +0000 @@ -1,3 +1,8 @@ +2012-03-19 Lars Magne Ingebrigtsen + + * shr.el (shr-insert): Update the text state properly to avoid + inserting spurious paragraph starts. + 2012-03-14 Lars Magne Ingebrigtsen * gnus-sum.el (gnus-update-marks): Don't propagate marks unless === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2012-03-14 22:15:04 +0000 +++ lisp/gnus/shr.el 2012-03-19 14:44:14 +0000 @@ -332,6 +332,7 @@ (unless shr-start (setq shr-start (point))) (insert elem) + (setq shr-state nil) (let (found) (while (and (> (current-column) shr-width) (progn