Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 102437. ------------------------------------------------------------ revno: 102437 committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2010-11-19 05:11:59 +0000 message: gnus-html.el (gnus-html-prefetch-images): Fix last change. diff: === modified file 'lisp/gnus/gnus-html.el' --- lisp/gnus/gnus-html.el 2010-11-19 04:55:16 +0000 +++ lisp/gnus/gnus-html.el 2010-11-19 05:11:59 +0000 @@ -508,7 +508,7 @@ (defun gnus-html-prefetch-images (summary) (when (buffer-live-p summary) (let (inhibit-images blocked-images) - (with-current-buffer summary-buffer + (with-current-buffer summary (setq inhibit-images gnus-inhibit-images blocked-images (gnus-blocked-images))) (save-match-data ------------------------------------------------------------ revno: 102436 committer: Katsumi Yamaoka branch nick: trunk timestamp: Fri 2010-11-19 04:55:16 +0000 message: Assume that gnus-inhibit-images may be a group parameter. gnus-art.el (gnus-mime-display-single) gnus-html.el (gnus-html-wash-images, gnus-html-prefetch-images) mm-decode.el (mm-shr): Assume that gnus-inhibit-images may be a group parameter. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-18 06:34:02 +0000 +++ lisp/gnus/ChangeLog 2010-11-19 04:55:16 +0000 @@ -1,3 +1,10 @@ +2010-11-19 Katsumi Yamaoka + + * gnus-art.el (gnus-mime-display-single) + * gnus-html.el (gnus-html-wash-images, gnus-html-prefetch-images) + * mm-decode.el (mm-shr): Assume that gnus-inhibit-images may be a group + parameter. + 2010-11-18 Lars Magne Ingebrigtsen * shr.el (shr-table-horizontal-line): Renamed from shr-table-line. === modified file 'lisp/gnus/gnus-art.el' --- lisp/gnus/gnus-art.el 2010-11-17 07:22:19 +0000 +++ lisp/gnus/gnus-art.el 2010-11-19 04:55:16 +0000 @@ -5851,7 +5851,10 @@ (while ignored (when (string-match (pop ignored) type) (throw 'ignored nil))) - (if (and (not (and gnus-inhibit-images + (if (and (not (and (if (gnus-buffer-live-p gnus-summary-buffer) + (with-current-buffer gnus-summary-buffer + gnus-inhibit-images) + gnus-inhibit-images) (string-match "\\`image/" type))) (setq not-attachment (and (not (mm-inline-override-p handle)) === modified file 'lisp/gnus/gnus-html.el' --- lisp/gnus/gnus-html.el 2010-11-18 02:00:00 +0000 +++ lisp/gnus/gnus-html.el 2010-11-19 04:55:16 +0000 @@ -169,7 +169,14 @@ (defun gnus-html-wash-images () "Run through current buffer and replace img tags by images." - (let (tag parameters string start end images url alt-text) + (let (tag parameters string start end images url alt-text + inhibit-images blocked-images) + (if (buffer-live-p gnus-summary-buffer) + (with-current-buffer gnus-summary-buffer + (setq inhibit-images gnus-inhibit-images + blocked-images (gnus-blocked-images))) + (setq inhibit-images gnus-inhibit-images + blocked-images (gnus-blocked-images))) (goto-char (point-min)) ;; Search for all the images first. (while (re-search-forward "]*\\)>" nil t) @@ -200,7 +207,7 @@ ;; immediately. (let* ((handle (mm-get-content-id (substring url (match-end 0)))) (image (when (and handle - (not gnus-inhibit-images)) + (not inhibit-images)) (gnus-create-image (mm-with-part handle (buffer-string)) nil t)))) @@ -222,13 +229,8 @@ :keymap gnus-html-image-map :button-keymap gnus-html-image-map))) ;; Normal, external URL. - (if (or gnus-inhibit-images - (gnus-html-image-url-blocked-p - url - (if (buffer-live-p gnus-summary-buffer) - (with-current-buffer gnus-summary-buffer - (gnus-blocked-images)) - (gnus-blocked-images)))) + (if (or inhibit-images + (gnus-html-image-url-blocked-p url blocked-images)) (widget-convert-button 'link start end :action 'gnus-html-insert-image @@ -505,13 +507,15 @@ ;;;###autoload (defun gnus-html-prefetch-images (summary) (when (buffer-live-p summary) - (let ((blocked-images (with-current-buffer summary - (gnus-blocked-images)))) + (let (inhibit-images blocked-images) + (with-current-buffer summary-buffer + (setq inhibit-images gnus-inhibit-images + blocked-images (gnus-blocked-images))) (save-match-data (while (re-search-forward "]+src=[\"']\\(http[^\"']+\\)" nil t) (let ((url (gnus-html-encode-url (mm-url-decode-entities-string (match-string 1))))) - (unless (or gnus-inhibit-images + (unless (or inhibit-images (gnus-html-image-url-blocked-p url blocked-images)) (when (gnus-html-cache-expired url gnus-html-image-cache-ttl) (gnus-html-schedule-image-fetching nil === modified file 'lisp/gnus/mm-decode.el' --- lisp/gnus/mm-decode.el 2010-11-17 07:22:19 +0000 +++ lisp/gnus/mm-decode.el 2010-11-19 04:55:16 +0000 @@ -1694,18 +1694,19 @@ ;; Require since we bind its variables. (require 'shr) (let ((article-buffer (current-buffer)) - (shr-blocked-images (if (and (boundp 'gnus-summary-buffer) - (buffer-name gnus-summary-buffer)) - (with-current-buffer gnus-summary-buffer - (gnus-blocked-images)) - shr-blocked-images)) (shr-content-function (lambda (id) (let ((handle (mm-get-content-id id))) (when handle (mm-with-part handle (buffer-string)))))) - (shr-inhibit-images gnus-inhibit-images) - charset) + shr-inhibit-images shr-blocked-images charset) + (if (and (boundp 'gnus-summary-buffer) + (buffer-name gnus-summary-buffer)) + (with-current-buffer gnus-summary-buffer + (setq shr-inhibit-images gnus-inhibit-images + shr-blocked-images (gnus-blocked-images))) + (setq shr-inhibit-images gnus-inhibit-images + shr-blocked-images (gnus-blocked-images))) (unless handle (setq handle (mm-dissect-buffer t))) (setq charset (mail-content-type-get (mm-handle-type handle) 'charset)) ------------------------------------------------------------ revno: 102435 committer: Jay Belanger branch nick: trunk timestamp: Thu 2010-11-18 19:14:36 -0600 message: calc.texi (TeX and LaTeX Language Modes, Predefined Units): calc-units.el (math-build-units-table-buffer): README: Mention that the TeX specific units won't use the `tex' prefix in TeX mode. calc-lang.el (math-variable-table): Don't use the `tex' prefix for units in TeX mode. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-11-18 03:54:14 +0000 +++ doc/misc/ChangeLog 2010-11-19 01:14:36 +0000 @@ -1,3 +1,9 @@ +2010-11-19 Jay Belanger + + * calc.texi (TeX and LaTeX Language Modes, Predefined Units): + Mention that the TeX specific units won't use the `tex' prefix + in TeX mode. + 2010-11-18 Katsumi Yamaoka * gnus.texi (Misc Article): Document gnus-inhibit-images. === modified file 'doc/misc/calc.texi' --- doc/misc/calc.texi 2010-11-09 20:07:10 +0000 +++ doc/misc/calc.texi 2010-11-19 01:14:36 +0000 @@ -14122,6 +14122,10 @@ @texline @math{\sin(2 + x)}. @infoline @expr{sin(2 + x)}. +The @TeX{} specific unit names (@pxref{Predefined Units}) will not use +the @samp{tex} prefix; the unit name for a @TeX{} point will be +@samp{pt} instead of @samp{texpt}, for example. + Function and variable names not treated specially by @TeX{} and La@TeX{} are simply written out as-is, which will cause them to come out in italic letters in the printed document. If you invoke @kbd{d T} or @@ -27990,6 +27994,14 @@ @code{texcc} (a Cicero) and @code{texsp} (a scaled @TeX{} point, all dimensions representable in @TeX{} are multiples of this value). +When Calc is using the @TeX{} or La@TeX{} language mode (@pxref{TeX +and LaTeX Language Modes}), the @TeX{} specific unit names will not +use the @samp{tex} prefix; the unit name for a @TeX{} point will be +@samp{pt} instead of @samp{texpt}, for example. To avoid conflicts, +the unit names for pint and parsec will simply be @samp{pint} and +@samp{parsec} instead of @samp{pt} and @samp{pc}. + + The unit @code{e} stands for the elementary (electron) unit of charge; because algebra command could mistake this for the special constant @expr{e}, Calc provides the alternate unit name @code{ech} which is === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-11-18 03:54:14 +0000 +++ lisp/ChangeLog 2010-11-19 01:14:36 +0000 @@ -1,3 +1,11 @@ +2010-11-19 Jay Belanger + + * calc/calc-units.el (math-build-units-table-buffer): + calc/README: Mention that the TeX specific units won't use the + `tex' prefix in TeX mode. + calc/calc-lang.el (math-variable-table): Don't use the `tex' + prefix for units in TeX mode. + 2010-11-18 Stefan Monnier * simple.el (kill-new, kill-append, kill-region): === modified file 'lisp/calc/README' --- lisp/calc/README 2010-08-09 02:30:10 +0000 +++ lisp/calc/README 2010-11-19 01:14:36 +0000 @@ -74,6 +74,9 @@ Emacs 24.1 +* Calc no longer uses the tex prefix for TeX specific unit +names when using TeX or LaTeX mode. + * Added option to highlight selections using faces. * Gave `calc-histogram' the option of using a vector to determine the bins. === modified file 'lisp/calc/calc-lang.el' --- lisp/calc/calc-lang.el 2010-06-22 07:41:10 +0000 +++ lisp/calc/calc-lang.el 2010-11-19 01:14:36 +0000 @@ -540,6 +540,16 @@ ( \\Psi . var-Psi ) ( \\omega . var-omega ) ( \\Omega . var-Omega ) + ;; Units + ( pt . var-texpt ) + ( pc . var-texpc ) + ( bp . var-texbp ) + ( dd . var-texdd ) + ( cc . var-texcc ) + ( sp . var-texsp ) + ( pint . var-pt ) + ( parsec . var-pc) + ;; Others ( \\ell . var-ell ) ( \\infty . var-inf ) === modified file 'lisp/calc/calc-units.el' --- lisp/calc/calc-units.el 2010-06-22 07:41:10 +0000 +++ lisp/calc/calc-units.el 2010-11-19 01:14:36 +0000 @@ -57,23 +57,23 @@ "149597870691 m (*)") ;; (approx) NASA JPL (http://neo.jpl.nasa.gov/glossary/au.html) ( lyr "c yr" "Light Year" ) - ( pc "3.0856775854*10^16 m" "Parsec" nil + ( pc "3.0856775854*10^16 m" "Parsec (**)" nil "3.0856775854 10^16 m (*)") ;; (approx) ESUWM ( nmi "1852 m" "Nautical Mile" ) ( fath "6 ft" "Fathom" ) ( fur "660 ft" "Furlong") ( mu "1 um" "Micron" ) ( mil "(1/1000) in" "Mil" ) - ( point "(1/72) in" "Point (1/72 inch)" ) + ( point "(1/72) in" "Point (PostScript convention)" ) ( Ang "10^(-10) m" "Angstrom" ) ( mfi "mi+ft+in" "Miles + feet + inches" ) ;; TeX lengths - ( texpt "(100/7227) in" "Point (TeX conventions)" ) - ( texpc "12 texpt" "Pica" ) - ( texbp "point" "Big point (TeX conventions)" ) - ( texdd "(1238/1157) texpt" "Didot point" ) - ( texcc "12 texdd" "Cicero" ) - ( texsp "(1/65536) texpt" "Scaled TeX point" ) + ( texpt "(100/7227) in" "Point (TeX convention) (**)" ) + ( texpc "12 texpt" "Pica (TeX convention) (**)" ) + ( texbp "point" "Big point (TeX convention) (**)" ) + ( texdd "(1238/1157) texpt" "Didot point (TeX convention) (**)" ) + ( texcc "12 texdd" "Cicero (TeX convention) (**)" ) + ( texsp "(1/65536) texpt" "Scaled TeX point (TeX convention) (**)" ) ;; Area ( hect "10000 m^2" "*Hectare" ) @@ -86,7 +86,7 @@ ( l "L" "Liter" ) ( gal "4 qt" "US Gallon" ) ( qt "2 pt" "Quart" ) - ( pt "2 cup" "Pint" ) + ( pt "2 cup" "Pint (**)" ) ( cup "8 ozfl" "Cup" ) ( ozfl "2 tbsp" "Fluid Ounce" ) ( floz "2 tbsp" "Fluid Ounce" ) @@ -1531,7 +1531,12 @@ (indent-to 15) (insert " " (nth 2 u) "\n") (while (eq (car (car (setq uptr (cdr uptr)))) 0))) - (insert "\n")) + (insert "\n\n") + (insert "(**) When in TeX or LaTeX display mode, the TeX specific unit\n" + "names will not use the `tex' prefix; the unit name for a\n" + "TeX point will be `pt' instead of `texpt', for example.\n" + "To avoid conflicts, the unit names for pint and parsec will\n" + "be `pint' and `parsec' instead of `pt' and `pc'.")) (view-mode) (message "Formatting units table...done")) (setq math-units-table-buffer-valid t) ------------------------------------------------------------ revno: 102434 committer: Dan Nicolaescu branch nick: trunk timestamp: Thu 2010-11-18 13:45:03 -0800 message: * src/alloc.c (refill_memory_reserve): Move declaration ... * src/lisp.h (refill_memory_reserve): ... here. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-11-18 21:39:15 +0000 +++ src/ChangeLog 2010-11-18 21:45:03 +0000 @@ -1,5 +1,8 @@ 2010-11-18 Dan Nicolaescu + * alloc.c (refill_memory_reserve): Move declaration ... + * lisp.h (refill_memory_reserve): ... here. + * strftime.c (_strftime_copytm): Add declaration. * callproc.c (syms_of_callproc): Use intern_c_string. === modified file 'src/alloc.c' --- src/alloc.c 2010-10-04 17:22:57 +0000 +++ src/alloc.c 2010-11-18 21:45:03 +0000 @@ -351,7 +351,6 @@ static POINTER_TYPE *lisp_align_malloc (size_t, enum mem_type); static POINTER_TYPE *lisp_malloc (size_t, enum mem_type); -void refill_memory_reserve (void); #if GC_MARK_STACK || defined GC_MALLOC_CHECK === modified file 'src/lisp.h' --- src/lisp.h 2010-11-18 16:57:00 +0000 +++ src/lisp.h 2010-11-18 21:45:03 +0000 @@ -2736,6 +2736,7 @@ extern void buffer_memory_full (void) NO_RETURN; extern int survives_gc_p (Lisp_Object); extern void mark_object (Lisp_Object); +extern void refill_memory_reserve (void); extern const char *pending_malloc_warning; extern Lisp_Object Vpurify_flag; extern Lisp_Object Vmemory_full; ------------------------------------------------------------ revno: 102433 committer: Dan Nicolaescu branch nick: trunk timestamp: Thu 2010-11-18 13:39:15 -0800 message: * src/strftime.c (_strftime_copytm): Add declaration. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-11-18 16:59:12 +0000 +++ src/ChangeLog 2010-11-18 21:39:15 +0000 @@ -1,5 +1,7 @@ 2010-11-18 Dan Nicolaescu + * strftime.c (_strftime_copytm): Add declaration. + * callproc.c (syms_of_callproc): Use intern_c_string. Move declarations from .c files to .h files. === modified file 'src/strftime.c' --- src/strftime.c 2010-11-18 16:49:30 +0000 +++ src/strftime.c 2010-11-18 21:39:15 +0000 @@ -461,6 +461,9 @@ /* Solaris 2.5 tzset sometimes modifies the storage returned by localtime. Work around this bug by copying *tp before it might be munged. */ size_t + _strftime_copytm (CHAR_T *s, size_t maxsize, const CHAR_T *format, + const struct tm *tp extra_args_spec LOCALE_PARAM_DECL); + size_t my_strftime (CHAR_T *s, size_t maxsize, const CHAR_T *format, const struct tm *tp extra_args_spec) { ------------------------------------------------------------ revno: 102432 committer: Dan Nicolaescu branch nick: trunk timestamp: Thu 2010-11-18 08:59:12 -0800 message: * src/callproc.c (syms_of_callproc): Use intern_c_string. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-11-18 16:57:00 +0000 +++ src/ChangeLog 2010-11-18 16:59:12 +0000 @@ -1,5 +1,7 @@ 2010-11-18 Dan Nicolaescu + * callproc.c (syms_of_callproc): Use intern_c_string. + Move declarations from .c files to .h files. * process.c (timers_run): * minibuf.c (quit_char): === modified file 'src/callproc.c' --- src/callproc.c 2010-11-15 18:11:52 +0000 +++ src/callproc.c 2010-11-18 16:59:12 +0000 @@ -1516,7 +1516,7 @@ syms_of_callproc (void) { #ifdef DOS_NT - Qbuffer_file_type = intern ("buffer-file-type"); + Qbuffer_file_type = intern_c_string ("buffer-file-type"); staticpro (&Qbuffer_file_type); #endif /* DOS_NT */ ------------------------------------------------------------ revno: 102431 committer: Dan Nicolaescu branch nick: trunk timestamp: Thu 2010-11-18 08:57:00 -0800 message: Move declarations from .c files to .h files. * src/process.c (timers_run): * src/minibuf.c (quit_char): * src/lread.c (read_emacs_mule_char): * src/keyboard.c (minibuf_level, message_enable_multibyte) (pending_malloc_warning): * src/insdel.c (Vselect_active_regions, Vsaved_region_selection) (Qonly): Remove declarations. * src/lisp.h (pending_malloc_warning, Vsaved_region_selection) (Vselect_active_regions): * src/keyboard.h (timers_run): Add declarations. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-11-18 16:49:30 +0000 +++ src/ChangeLog 2010-11-18 16:57:00 +0000 @@ -1,5 +1,17 @@ 2010-11-18 Dan Nicolaescu + Move declarations from .c files to .h files. + * process.c (timers_run): + * minibuf.c (quit_char): + * lread.c (read_emacs_mule_char): + * keyboard.c (minibuf_level, message_enable_multibyte) + (pending_malloc_warning): + * insdel.c (Vselect_active_regions, Vsaved_region_selection) + (Qonly): Remove declarations. + * lisp.h (pending_malloc_warning, Vsaved_region_selection) + (Vselect_active_regions): + * keyboard.h (timers_run): Add declarations. + * strftime.c (my_strftime_gmtime_r, my_strftime_localtime_r) (tm_diff): Convert definitions to standard C. (extra_args_spec_iso): Remove, unused. === modified file 'src/insdel.c' --- src/insdel.c 2010-10-21 17:27:32 +0000 +++ src/insdel.c 2010-11-18 16:57:00 +0000 @@ -73,9 +73,6 @@ Lisp_Object combine_after_change_buffer; Lisp_Object Qinhibit_modification_hooks; - -extern Lisp_Object Vselect_active_regions, Vsaved_region_selection, Qonly; - /* Check all markers in the current buffer, looking for something invalid. */ @@ -2395,5 +2392,3 @@ defsubr (&Scombine_after_change_execute); } -/* arch-tag: 9b34b886-47d7-465e-a234-299af411b23d - (do not change this comment) */ === modified file 'src/keyboard.c' --- src/keyboard.c 2010-11-18 03:54:14 +0000 +++ src/keyboard.c 2010-11-18 16:57:00 +0000 @@ -144,10 +144,6 @@ static int before_command_key_count; static int before_command_echo_length; -extern int minbuf_level; - -extern int message_enable_multibyte; - /* If non-nil, the function that implements the display of help. It's called with one argument, the help string to display. */ @@ -431,8 +427,6 @@ /* Nonzero if input is available. */ int input_pending; -extern const char *pending_malloc_warning; - /* Circular buffer for pre-read keyboard input. */ static struct input_event kbd_buffer[KBD_BUFFER_SIZE]; @@ -12434,5 +12428,3 @@ } } -/* arch-tag: 774e34d7-6d31-42f3-8397-e079a4e4c9ca - (do not change this comment) */ === modified file 'src/keyboard.h' --- src/keyboard.h 2010-09-25 09:36:36 +0000 +++ src/keyboard.h 2010-11-18 16:57:00 +0000 @@ -490,6 +490,8 @@ extern int quit_char; +extern int timers_run; + extern int parse_menu_item (Lisp_Object, int); extern void echo_now (void); @@ -534,5 +536,3 @@ struct input_event *); extern EMACS_TIME timer_check (int); -/* arch-tag: 769cbade-1ba9-4950-b886-db265b061aa3 - (do not change this comment) */ === modified file 'src/lisp.h' --- src/lisp.h 2010-11-12 09:31:44 +0000 +++ src/lisp.h 2010-11-18 16:57:00 +0000 @@ -2736,6 +2736,7 @@ extern void buffer_memory_full (void) NO_RETURN; extern int survives_gc_p (Lisp_Object); extern void mark_object (Lisp_Object); +extern const char *pending_malloc_warning; extern Lisp_Object Vpurify_flag; extern Lisp_Object Vmemory_full; extern Lisp_Object *stack_base; @@ -3233,6 +3234,8 @@ extern Lisp_Object Qabove_handle, Qhandle, Qbelow_handle; extern Lisp_Object Qup, Qdown, Qbottom, Qend_scroll; extern Lisp_Object Qtop, Qratio; +extern Lisp_Object Vsaved_region_selection; +extern Lisp_Object Vselect_active_regions; extern Lisp_Object Vtty_erase_char, Vhelp_form, Vtop_level; extern Lisp_Object Vthrow_on_input; extern int input_pending; === modified file 'src/lread.c' --- src/lread.c 2010-11-18 03:54:14 +0000 +++ src/lread.c 2010-11-18 16:57:00 +0000 @@ -552,8 +552,6 @@ encoded in `emacs-mule' and the first byte is already read in C. */ -extern char emacs_mule_bytes[256]; - static int read_emacs_mule_char (int c, int (*readbyte) (int, Lisp_Object), Lisp_Object readcharfun) { === modified file 'src/minibuf.c' --- src/minibuf.c 2010-09-25 11:55:30 +0000 +++ src/minibuf.c 2010-11-18 16:57:00 +0000 @@ -36,8 +36,6 @@ #include "keymap.h" #include "termhooks.h" -extern int quit_char; - /* List of buffers for use as minibuffers. The first element of the list is used for the outermost minibuffer invocation, the next element is used for a recursive minibuffer @@ -2242,5 +2240,3 @@ defsubr (&Scompleting_read); } -/* arch-tag: 8f69b601-fba3-484c-a6dd-ceaee54a7a73 - (do not change this comment) */ === modified file 'src/process.c' --- src/process.c 2010-11-18 03:54:14 +0000 +++ src/process.c 2010-11-18 16:57:00 +0000 @@ -113,8 +113,6 @@ #include "nsterm.h" #endif -extern int timers_run; - Lisp_Object Qeuid, Qegid, Qcomm, Qstate, Qppid, Qpgrp, Qsess, Qttname, Qtpgid; Lisp_Object Qminflt, Qmajflt, Qcminflt, Qcmajflt, Qutime, Qstime, Qcstime; Lisp_Object Qcutime, Qpri, Qnice, Qthcount, Qstart, Qvsize, Qrss, Qargs; @@ -7744,5 +7742,3 @@ defsubr (&Sprocess_attributes); } -/* arch-tag: 3706c011-7b9a-4117-bd4f-59e7f701a4c4 - (do not change this comment) */ ------------------------------------------------------------ revno: 102430 committer: Dan Nicolaescu branch nick: trunk timestamp: Thu 2010-11-18 08:49:30 -0800 message: Convert definitions to standard C. * src/strftime.c (my_strftime_gmtime_r, my_strftime_localtime_r) (tm_diff): Convert definitions to standard C. (extra_args_spec_iso): Remove, unused. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-11-18 03:54:14 +0000 +++ src/ChangeLog 2010-11-18 16:49:30 +0000 @@ -1,3 +1,9 @@ +2010-11-18 Dan Nicolaescu + + * strftime.c (my_strftime_gmtime_r, my_strftime_localtime_r) + (tm_diff): Convert definitions to standard C. + (extra_args_spec_iso): Remove, unused. + 2010-11-18 Jan Djärv * xsettings.c (init_gconf): Check HAVE_G_TYPE_INIT. === modified file 'src/strftime.c' --- src/strftime.c 2010-11-16 06:44:51 +0000 +++ src/strftime.c 2010-11-18 16:49:30 +0000 @@ -179,11 +179,8 @@ Similarly for localtime_r. */ # if ! HAVE_TM_GMTOFF -static struct tm *my_strftime_gmtime_r (const time_t *, struct tm *); static struct tm * -my_strftime_gmtime_r (t, tp) - const time_t *t; - struct tm *tp; +my_strftime_gmtime_r (const time_t *t, struct tm *tp) { struct tm *l = gmtime (t); if (! l) @@ -192,11 +189,8 @@ return tp; } -static struct tm *my_strftime_localtime_r (const time_t *, struct tm *); static struct tm * -my_strftime_localtime_r (t, tp) - const time_t *t; - struct tm *tp; +my_strftime_localtime_r (const time_t *t, struct tm *tp) { struct tm *l = localtime (t); if (! l) @@ -380,11 +374,8 @@ /* Yield the difference between *A and *B, measured in seconds, ignoring leap seconds. */ # define tm_diff ftime_tm_diff -static int tm_diff (const struct tm *, const struct tm *); static int -tm_diff (a, b) - const struct tm *a; - const struct tm *b; +tm_diff (const struct tm *a, const struct tm *b) { /* Compute intervening leap days correctly even if year is negative. Take care to avoid int overflow in leap day calculations, @@ -451,7 +442,6 @@ #ifdef my_strftime # define extra_args , ut, ns # define extra_args_spec , int ut, int ns -# define extra_args_spec_iso , int ut, int ns #else # ifdef COMPILE_WIDE # define my_strftime wcsftime @@ -462,7 +452,6 @@ # endif # define extra_args # define extra_args_spec -# define extra_args_spec_iso /* We don't have this information in general. */ # define ut 0 # define ns 0 @@ -471,15 +460,9 @@ #if !defined _LIBC && !defined(WINDOWSNT) && HAVE_TZNAME && HAVE_TZSET /* Solaris 2.5 tzset sometimes modifies the storage returned by localtime. Work around this bug by copying *tp before it might be munged. */ - size_t _strftime_copytm (char *, size_t, const char *, - const struct tm * extra_args_spec_iso); size_t - my_strftime (s, maxsize, format, tp extra_args) - CHAR_T *s; - size_t maxsize; - const CHAR_T *format; - const struct tm *tp; - extra_args_spec + my_strftime (CHAR_T *s, size_t maxsize, const CHAR_T *format, + const struct tm *tp extra_args_spec) { struct tm tmcopy; tmcopy = *tp; ------------------------------------------------------------ revno: 102429 author: Lars Magne Ingebrigtsen committer: Katsumi Yamaoka branch nick: trunk timestamp: Thu 2010-11-18 06:34:02 +0000 message: shr.el: Allow customizing the vertical table lines. shr.el (shr-table-horizontal-line): Renamed from shr-table-line. (shr-table-vertical-line): New variable. (shr-insert-table): Use it. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-11-18 02:00:00 +0000 +++ lisp/gnus/ChangeLog 2010-11-18 06:34:02 +0000 @@ -1,3 +1,9 @@ +2010-11-18 Lars Magne Ingebrigtsen + + * shr.el (shr-table-horizontal-line): Renamed from shr-table-line. + (shr-table-vertical-line): New variable. + (shr-insert-table): Use it. + 2010-11-18 Katsumi Yamaoka * gnus-html.el (gnus-html-wash-images): Don't display images if === modified file 'lisp/gnus/shr.el' --- lisp/gnus/shr.el 2010-11-17 22:15:24 +0000 +++ lisp/gnus/shr.el 2010-11-18 06:34:02 +0000 @@ -55,18 +55,23 @@ :group 'shr :type 'regexp) -(defcustom shr-table-line ?- - "Character used to draw table line." +(defcustom shr-table-horizontal-line ?- + "Character used to draw horizontal table lines." + :group 'shr + :type 'character) + +(defcustom shr-table-vertical-line ?| + "Character used to draw vertical table lines." :group 'shr :type 'character) (defcustom shr-table-corner ?+ - "Character used to draw table corner." + "Character used to draw table corners." :group 'shr :type 'character) (defcustom shr-hr-line ?- - "Character used to draw hr line." + "Character used to draw hr lines." :group 'shr :type 'character) @@ -778,7 +783,7 @@ max))) (dotimes (i height) (shr-indent) - (insert "|\n")) + (insert shr-table-vertical-line "\n")) (dolist (column row) (goto-char start) (let ((lines (nth 2 column)) @@ -787,7 +792,7 @@ (dolist (line lines) (setq overlay-line (pop overlay-lines)) (end-of-line) - (insert line "|") + (insert line shr-table-vertical-line) (dolist (overlay overlay-line) (let ((o (make-overlay (- (point) (nth 0 overlay) 1) (- (point) (nth 1 overlay) 1))) @@ -799,7 +804,8 @@ ;; possibly. (dotimes (i (- height (length lines))) (end-of-line) - (insert (make-string (string-width (car lines)) ? ) "|") + (insert (make-string (string-width (car lines)) ? ) + shr-table-vertical-line) (forward-line 1))))) (shr-insert-table-ruler widths))) @@ -809,7 +815,8 @@ (shr-indent)) (insert shr-table-corner) (dotimes (i (length widths)) - (insert (make-string (aref widths i) shr-table-line) shr-table-corner)) + (insert (make-string (aref widths i) shr-table-horizontal-line) + shr-table-corner)) (insert "\n")) (defun shr-table-widths (table suggested-widths)