Now on revision 113278. ------------------------------------------------------------ revno: 113278 fixes bug: http://debbugs.gnu.org/14569 committer: Paul Eggert branch nick: trunk timestamp: Wed 2013-07-03 23:20:55 -0700 message: Try again to fix FreeBSD bug re multithreaded memory alloc. * emacs.c (main) [HAVE_PTHREAD && !SYSTEM_MALLOC && !DOUG_LEA_MALLOC]: Do not clear _malloc_thread_enabled_p, undoing the previous change, which did not work (see ). (main): Do not invoke malloc_enable_thread if (! CANNOT_DUMP && (!noninteractive || initialized)). This attempts to thread the needle between the Scylla of FreeBSD and the Charybdis of Cygwin. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-07-04 02:08:56 +0000 +++ src/ChangeLog 2013-07-04 06:20:55 +0000 @@ -1,3 +1,13 @@ +2013-07-04 Paul Eggert + + Try again to fix FreeBSD bug re multithreaded memory alloc (Bug#14569). + * emacs.c (main) [HAVE_PTHREAD && !SYSTEM_MALLOC && !DOUG_LEA_MALLOC]: + Do not clear _malloc_thread_enabled_p, undoing the previous change, + which did not work (see ). + (main): Do not invoke malloc_enable_thread if (! CANNOT_DUMP + && (!noninteractive || initialized)). This attempts to thread + the needle between the Scylla of FreeBSD and the Charybdis of Cygwin. + 2013-07-04 Juanma Barranquero * image.c (x_to_xcolors) [HAVE_NTGUI]: Remove unused var `hdc'. === modified file 'src/emacs.c' --- src/emacs.c 2013-07-04 00:53:13 +0000 +++ src/emacs.c 2013-07-04 06:20:55 +0000 @@ -128,7 +128,6 @@ dumping. Used to work around a bug in glibc's malloc. */ static bool malloc_using_checking; #elif defined HAVE_PTHREAD && !defined SYSTEM_MALLOC -extern int _malloc_thread_enabled_p; extern void malloc_enable_thread (void); #endif @@ -682,12 +681,6 @@ stack_base = &dummy; #endif -#if defined HAVE_PTHREAD && !defined SYSTEM_MALLOC && !defined DOUG_LEA_MALLOC - /* Disable mutexes in gmalloc.c. Otherwise, FreeBSD Emacs recursively - loops with pthread_mutex_lock calling calloc and vice versa. */ - _malloc_thread_enabled_p = 0; -#endif - #ifdef G_SLICE_ALWAYS_MALLOC /* This is used by the Cygwin build. */ xputenv ("G_SLICE=always-malloc"); @@ -1084,7 +1077,14 @@ } #if defined HAVE_PTHREAD && !defined SYSTEM_MALLOC && !defined DOUG_LEA_MALLOC - malloc_enable_thread (); +# ifndef CANNOT_DUMP + /* Do not make gmalloc thread-safe when creating bootstrap-emacs, as + that causes an infinite recursive loop with FreeBSD. But do make + it thread-safe when creating emacs, otherwise bootstrap-emacs + fails on Cygwin. See Bug#14569. */ + if (!noninteractive || initialized) +# endif + malloc_enable_thread (); #endif init_signals (dumping); ------------------------------------------------------------ revno: 113277 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-07-03 19:30:36 -0700 message: * admin/FOR-RELEASE: Add note about linc.py. diff: === modified file 'admin/FOR-RELEASE' --- admin/FOR-RELEASE 2013-06-25 02:15:00 +0000 +++ admin/FOR-RELEASE 2013-07-04 02:30:36 +0000 @@ -18,6 +18,20 @@ Redirect /software/emacs/manual/html_mono/automake.html /software/automake/manual/automake.html Redirect /software/emacs/manual/html_node/automake/ /software/automake/manual/html_node/ +Another tool you can use to check links is gnu.org's linc.py: +http://www.gnu.org/server/source/ + +You run this something like: + +cd /path/to/cvs/emacs-www +linc.py -o /path/to/output-dir --url http://www.gnu.org/software/emacs/ . + +Be warned that it is really, really slow (as in, can take ~ a full day +to check the manual/ directory). It is probably best to run it on a +single directory at a time from eg manual/html_node. It is very +inefficient, but may reveal a few things that info-xref does not. + + make emacs.dvi, elisp.dvi, and deal with any errors (undefined references etc) in the output. Break any overfull lines. Underfull hboxes are not serious, but it can be nice to get rid of ------------------------------------------------------------ revno: 113276 committer: Juanma Barranquero branch nick: trunk timestamp: Thu 2013-07-04 04:08:56 +0200 message: src/image: Remove unused variables. (x_to_xcolors) [HAVE_NTGUI]: Remove unused var `hdc'. (x_build_heuristic_mask) [HAVE_NTGUI]: Remove unused var `frame_dc'. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-07-04 00:53:13 +0000 +++ src/ChangeLog 2013-07-04 02:08:56 +0000 @@ -1,3 +1,8 @@ +2013-07-04 Juanma Barranquero + + * image.c (x_to_xcolors) [HAVE_NTGUI]: Remove unused var `hdc'. + (x_build_heuristic_mask) [HAVE_NTGUI]: Remove unused var `frame_dc'. + 2013-07-04 Paul Eggert Try to fix FreeBSD bug re multithreaded memory allocation (Bug#14569). === modified file 'src/image.c' --- src/image.c 2013-06-29 15:52:20 +0000 +++ src/image.c 2013-07-04 02:08:56 +0000 @@ -4559,7 +4559,6 @@ XColor *colors, *p; XImagePtr_or_DC ximg; #ifdef HAVE_NTGUI - HDC hdc; HGDIOBJ prev; #endif /* HAVE_NTGUI */ @@ -4929,7 +4928,6 @@ #ifndef HAVE_NTGUI XImagePtr mask_img; #else - HDC frame_dc; HGDIOBJ prev; char *mask_img; int row_width; ------------------------------------------------------------ revno: 113275 fixes bug: http://debbugs.gnu.org/14569 committer: Paul Eggert branch nick: trunk timestamp: Wed 2013-07-03 17:53:13 -0700 message: Try to fix FreeBSD bug re multithreaded memory allocation. * src/emacs.c (main) [HAVE_PTHREAD && !SYSTEM_MALLOC && !DOUG_LEA_MALLOC]: Clear _malloc_thread_enabled_p at startup. Reported by Ashish SHUKLA in . diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-07-02 16:56:29 +0000 +++ src/ChangeLog 2013-07-04 00:53:13 +0000 @@ -1,3 +1,10 @@ +2013-07-04 Paul Eggert + + Try to fix FreeBSD bug re multithreaded memory allocation (Bug#14569). + * emacs.c (main) [HAVE_PTHREAD && !SYSTEM_MALLOC && !DOUG_LEA_MALLOC]: + Clear _malloc_thread_enabled_p at startup. Reported by Ashish SHUKLA in + . + 2013-07-02 Paul Eggert * sysdep.c (sys_siglist) [HAVE_DECL___SYS_SIGLIST]: === modified file 'src/emacs.c' --- src/emacs.c 2013-07-01 21:06:12 +0000 +++ src/emacs.c 2013-07-04 00:53:13 +0000 @@ -128,6 +128,7 @@ dumping. Used to work around a bug in glibc's malloc. */ static bool malloc_using_checking; #elif defined HAVE_PTHREAD && !defined SYSTEM_MALLOC +extern int _malloc_thread_enabled_p; extern void malloc_enable_thread (void); #endif @@ -681,6 +682,12 @@ stack_base = &dummy; #endif +#if defined HAVE_PTHREAD && !defined SYSTEM_MALLOC && !defined DOUG_LEA_MALLOC + /* Disable mutexes in gmalloc.c. Otherwise, FreeBSD Emacs recursively + loops with pthread_mutex_lock calling calloc and vice versa. */ + _malloc_thread_enabled_p = 0; +#endif + #ifdef G_SLICE_ALWAYS_MALLOC /* This is used by the Cygwin build. */ xputenv ("G_SLICE=always-malloc"); ------------------------------------------------------------ revno: 113274 fixes bug: http://debbugs.gnu.org/14673 committer: Juri Linkov branch nick: trunk timestamp: Thu 2013-07-04 02:11:58 +0300 message: * lisp/buff-menu.el (Buffer-menu-multi-occur): Add args and move the call of `occur-read-primary-args' to interactive spec. * lisp/ibuffer.el (ibuffer-mode-map): Bind "M-s a C-o" to `ibuffer-do-occur' like in buff-menu.el. diff: === modified file 'etc/NEWS' --- etc/NEWS 2013-07-01 03:29:46 +0000 +++ etc/NEWS 2013-07-03 23:11:58 +0000 @@ -218,6 +218,10 @@ *** Battery information via the BSD `apm' utility is now supported. +** Buffer Menu + +*** `M-s a C-o' shows lines matching a regexp in marked buffers using Occur. + ** Calendar and Diary +++ === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-07-03 23:04:55 +0000 +++ lisp/ChangeLog 2013-07-03 23:11:58 +0000 @@ -1,3 +1,11 @@ +2013-07-03 Juri Linkov + + * buff-menu.el (Buffer-menu-multi-occur): Add args and move the + call of `occur-read-primary-args' to interactive spec. + + * ibuffer.el (ibuffer-mode-map): Bind "M-s a C-o" to + `ibuffer-do-occur' like in buff-menu.el. (Bug#14673) + 2013-07-03 Matthias Meulien * buff-menu.el (Buffer-menu-mode-map): Bind "M-s a C-o" to === modified file 'lisp/buff-menu.el' --- lisp/buff-menu.el 2013-07-03 23:04:55 +0000 +++ lisp/buff-menu.el 2013-07-03 23:11:58 +0000 @@ -482,11 +482,10 @@ (interactive) (multi-isearch-buffers-regexp (Buffer-menu-marked-buffers))) -(defun Buffer-menu-multi-occur () +(defun Buffer-menu-multi-occur (regexp &optional nlines) "Show all lines in marked buffers containing a match for a regexp." - (interactive) - (let ((regexp (occur-read-primary-args))) - (multi-occur (Buffer-menu-marked-buffers) (car regexp)))) + (interactive (occur-read-primary-args)) + (multi-occur (Buffer-menu-marked-buffers) regexp nlines)) (defun Buffer-menu-visit-tags-table () === modified file 'lisp/ibuffer.el' --- lisp/ibuffer.el 2013-06-13 10:21:04 +0000 +++ lisp/ibuffer.el 2013-07-03 23:11:58 +0000 @@ -462,6 +462,7 @@ (define-key map (kbd "M-g") 'ibuffer-jump-to-buffer) (define-key map (kbd "M-s a C-s") 'ibuffer-do-isearch) (define-key map (kbd "M-s a M-C-s") 'ibuffer-do-isearch-regexp) + (define-key map (kbd "M-s a C-o") 'ibuffer-do-occur) (define-key map (kbd "DEL") 'ibuffer-unmark-backward) (define-key map (kbd "M-DEL") 'ibuffer-unmark-all) (define-key map (kbd "* *") 'ibuffer-unmark-all) ------------------------------------------------------------ revno: 113273 fixes bug: http://debbugs.gnu.org/14673 author: Matthias Meulien committer: Juri Linkov branch nick: trunk timestamp: Thu 2013-07-04 02:04:55 +0300 message: * lisp/buff-menu.el (Buffer-menu-mode-map): Bind "M-s a C-o" to `Buffer-menu-multi-occur'. Add it to the menu. (Buffer-menu-mode): Document it in docstring. (Buffer-menu-multi-occur): New command. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-07-03 15:46:45 +0000 +++ lisp/ChangeLog 2013-07-03 23:04:55 +0000 @@ -1,3 +1,10 @@ +2013-07-03 Matthias Meulien + + * buff-menu.el (Buffer-menu-mode-map): Bind "M-s a C-o" to + `Buffer-menu-multi-occur'. Add it to the menu. + (Buffer-menu-mode): Document it in docstring. + (Buffer-menu-multi-occur): New command. (Bug#14673) + 2013-07-03 Dmitry Gutov * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight more @@ -999,6 +1006,7 @@ 2013-06-18 Matthias Meulien * tabify.el (untabify, tabify): With prefix, apply to entire buffer. + 2013-06-18 Glenn Morris === modified file 'lisp/buff-menu.el' --- lisp/buff-menu.el 2013-01-01 09:11:05 +0000 +++ lisp/buff-menu.el 2013-07-03 23:04:55 +0000 @@ -129,6 +129,7 @@ (define-key map "T" 'Buffer-menu-toggle-files-only) (define-key map (kbd "M-s a C-s") 'Buffer-menu-isearch-buffers) (define-key map (kbd "M-s a M-C-s") 'Buffer-menu-isearch-buffers-regexp) + (define-key map (kbd "M-s a C-o") 'Buffer-menu-multi-occur) (define-key map [mouse-2] 'Buffer-menu-mouse-select) (define-key map [follow-link] 'mouse-face) @@ -169,6 +170,9 @@ (bindings--define-key menu-map [ir] '(menu-item "Isearch Marked Buffers..." Buffer-menu-isearch-buffers :help "Search for a string through all marked buffers using Isearch")) + (bindings--define-key menu-map [mo] + '(menu-item "Multi Occur Marked Buffers..." Buffer-menu-multi-occur + :help "Show lines matching a regexp in marked buffers using Occur")) (bindings--define-key menu-map [s3] menu-bar-separator) (bindings--define-key menu-map [by] '(menu-item "Bury" Buffer-menu-bury @@ -226,6 +230,7 @@ buffer selected before this one in another window. \\[Buffer-menu-isearch-buffers] Incremental search in the marked buffers. \\[Buffer-menu-isearch-buffers-regexp] Isearch for regexp in the marked buffers. +\\[Buffer-menu-multi-occur] Show lines matching regexp in the marked buffers. \\[Buffer-menu-visit-tags-table] visit-tags-table this buffer. \\[Buffer-menu-not-modified] Clear modified-flag on that buffer. \\[Buffer-menu-save] Mark that buffer to be saved, and move down. @@ -477,6 +482,12 @@ (interactive) (multi-isearch-buffers-regexp (Buffer-menu-marked-buffers))) +(defun Buffer-menu-multi-occur () + "Show all lines in marked buffers containing a match for a regexp." + (interactive) + (let ((regexp (occur-read-primary-args))) + (multi-occur (Buffer-menu-marked-buffers) (car regexp)))) + (defun Buffer-menu-visit-tags-table () "Visit the tags table in the buffer on this line. See `visit-tags-table'." ------------------------------------------------------------ revno: 113272 committer: Paul Eggert branch nick: trunk timestamp: Wed 2013-07-03 14:07:48 -0700 message: * texinfo.tex: Merge from gnulib. diff: === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2013-07-03 03:20:04 +0000 +++ doc/misc/ChangeLog 2013-07-03 21:07:48 +0000 @@ -1,3 +1,7 @@ +2013-07-03 Paul Eggert + + * texinfo.tex: Merge from gnulib. + 2013-07-03 Glenn Morris * bovine.texi (top): === modified file 'doc/misc/texinfo.tex' --- doc/misc/texinfo.tex 2013-02-08 23:37:17 +0000 +++ doc/misc/texinfo.tex 2013-07-03 21:07:48 +0000 @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2013-02-01.11} +\def\texinfoversion{2013-06-23.10} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -2475,14 +2475,14 @@ } % We *must* turn on hyphenation at `-' and `_' in @code. +% (But see \codedashfinish below.) % Otherwise, it is too hard to avoid overfull hboxes % in the Emacs manual, the Library manual, etc. % % Unfortunately, TeX uses one parameter (\hyphenchar) to control % both hyphenation at - and hyphenation within words. % We must therefore turn them both off (\tclose does that) -% and arrange explicitly to hyphenate at a dash. -% -- rms. +% and arrange explicitly to hyphenate at a dash. -- rms. { \catcode`\-=\active \catcode`\_=\active \catcode`\'=\active \catcode`\`=\active @@ -2499,14 +2499,33 @@ \let-\normaldash \let_\realunder \fi + % Given -foo (with a single dash), we do not want to allow a break + % after the hyphen. + \global\let\codedashprev=\codedash + % \codex } + % + \gdef\codedash{\futurelet\next\codedashfinish} + \gdef\codedashfinish{% + \normaldash % always output the dash character itself. + % + % Now, output a discretionary to allow a line break, unless + % (a) the next character is a -, or + % (b) the preceding character is a -. + % E.g., given --posix, we do not want to allow a break after either -. + % Given --foo-bar, we do want to allow a break between the - and the b. + \ifx\next\codedash \else + \ifx\codedashprev\codedash + \else \discretionary{}{}{}\fi + \fi + \global\let\codedashprev=\next + } } - +\def\normaldash{-} +% \def\codex #1{\tclose{#1}\endgroup} -\def\normaldash{-} -\def\codedash{-\discretionary{}{}{}} \def\codeunder{% % this is all so @math{@code{var_name}+1} can work. In math mode, _ % is "active" (mathcode"8000) and \normalunderscore (or \char95, etc.) @@ -4211,8 +4230,9 @@ % @ifset VAR ... @end ifset reads the `...' iff VAR has been defined % with @set. -% -% To get special treatment of `@end ifset,' call \makeond and the redefine. +% +% To get the special treatment we need for `@end ifset,' we call +% \makecond and then redefine. % \makecond{ifset} \def\ifset{\parsearg{\doifset{\let\next=\ifsetfail}}} @@ -6402,7 +6422,7 @@ \newdimen\nonfillparindent \def\nonfillstart{% \aboveenvbreak - \hfuzz = 12pt % Don't be fussy + \ifdim\hfuzz < 12pt \hfuzz = 12pt \fi % Don't be fussy \sepspaces % Make spaces be word-separators rather than space tokens. \let\par = \lisppar % don't ignore blank lines \obeylines % each line of input is a line of output ------------------------------------------------------------ revno: 113271 committer: Dmitry Gutov branch nick: trunk timestamp: Wed 2013-07-03 19:46:45 +0400 message: * lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight more keywords and built-ins. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-07-03 03:20:04 +0000 +++ lisp/ChangeLog 2013-07-03 15:46:45 +0000 @@ -1,3 +1,8 @@ +2013-07-03 Dmitry Gutov + + * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight more + keywords and built-ins. + 2013-07-03 Glenn Morris * subr.el (y-or-n-p): Handle empty prompts. (Bug#14770) === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-07-03 01:02:18 +0000 +++ lisp/progmodes/ruby-mode.el 2013-07-03 15:46:45 +0000 @@ -1762,31 +1762,67 @@ "yield") 'symbols) "\\|" - ;; keyword-like methods on Kernel and Module (regexp-opt - '("alias_method" + ;; built-in methods on Kernel + '("__callee__" + "__dir__" + "__method__" + "abort" + "at_exit" + "autoload" + "autoload?" + "binding" + "block_given?" + "caller" + "catch" + "eval" + "exec" + "exit" + "exit!" + "fail" + "fork" + "format" + "lambda" + "load" + "loop" + "open" + "p" + "print" + "printf" + "proc" + "putc" + "puts" + "raise" + "rand" + "readline" + "readlines" + "require" + "require_relative" + "sleep" + "spawn" + "sprintf" + "srand" + "syscall" + "system" + "throw" + "trap" + "warn" + ;; keyword-like private methods on Module + "alias_method" "autoload" "attr" "attr_accessor" "attr_reader" "attr_writer" - "catch" "define_method" "extend" - "fail" "include" - "lambda" - "loop" "module_function" + "prepend" "private" - "proc" "protected" "public" - "raise" "refine" - "require" - "require_relative" - "throw" "using") 'symbols) "\\)") @@ -1794,12 +1830,16 @@ '(if (match-beginning 4) font-lock-builtin-face font-lock-keyword-face)) + ;; Perl-ish keywords + "\\_<\\(?:BEGIN\\|END\\)\\_>\\|^__END__$" ;; here-doc beginnings `(,ruby-here-doc-beg-re 0 (unless (ruby-singleton-class-p (match-beginning 0)) 'font-lock-string-face)) ;; variables '("\\(^\\|[^.@$]\\|\\.\\.\\)\\_<\\(nil\\|self\\|true\\|false\\)\\>" 2 font-lock-variable-name-face) + ;; keywords that evaluate to certain values + '("\\_<__\\(?:LINE\\|ENCODING\\|FILE\\)__\\_>" 0 font-lock-variable-name-face) ;; symbols '("\\(^\\|[^:]\\)\\(:\\([-+~]@?\\|[/%&|^`]\\|\\*\\*?\\|<\\(<\\|=>?\\)?\\|>[>=]?\\|===?\\|=~\\|![~=]?\\|\\[\\]=?\\|@?\\(\\w\\|_\\)+\\([!?=]\\|\\b_*\\)\\|#{[^}\n\\\\]*\\(\\\\.[^}\n\\\\]*\\)*}\\)\\)" 2 font-lock-constant-face) ------------------------------------------------------------ revno: 113270 committer: Glenn Morris branch nick: trunk timestamp: Wed 2013-07-03 06:17:43 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/config.in' --- autogen/config.in 2013-07-02 10:17:36 +0000 +++ autogen/config.in 2013-07-03 10:17:43 +0000 @@ -90,9 +90,6 @@ /* Name of the default sound device. */ #undef DEFAULT_SOUND_DEVICE -/* Character that separates a device in a file name. */ -#undef DEVICE_SEP - /* Define to 1 for DGUX with . */ #undef DGUX @@ -281,9 +278,6 @@ /* Define to 1 if the ACL type ACL_TYPE_EXTENDED exists. */ #undef HAVE_ACL_TYPE_EXTENDED -/* Define to 1 if the file /usr/lpp/X11/bin/smt.exp exists. */ -#undef HAVE_AIX_SMT_EXP - /* Define to 1 if you have 'alloca' after including , a header that may be supplied by this distribution. */ #undef HAVE_ALLOCA @@ -412,12 +406,6 @@ don't. */ #undef HAVE_DECL___SYS_SIGLIST -/* Define to 1 if you have the header file. */ -#undef HAVE_DES_H - -/* Define to 1 if dynamic ptys are supported. */ -#undef HAVE_DEV_PTMX - /* Define to 1 if you have the `difftime' function. */ #undef HAVE_DIFFTIME @@ -559,13 +547,6 @@ /* Define if using GnuTLS. */ #undef HAVE_GNUTLS -/* Define if using GnuTLS certificate verification callbacks. */ -#undef HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY - -/* Define to 1 if you have the `gnutls_certificate_set_verify_function' - function. */ -#undef HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION - /* Define to 1 if you have the gpm library (-lgpm). */ #undef HAVE_GPM @@ -635,15 +616,9 @@ /* Define to 1 if you have the jpeg library (-ljpeg). */ #undef HAVE_JPEG -/* Define to 1 if you have the header file. */ -#undef HAVE_KERBEROSIV_DES_H - /* Define to 1 if you have the header file. */ #undef HAVE_KERBEROSIV_KRB_H -/* Define to 1 if you have the header file. */ -#undef HAVE_KERBEROS_DES_H - /* Define to 1 if you have the header file. */ #undef HAVE_KERBEROS_KRB_H @@ -662,18 +637,6 @@ /* Define if you have and nl_langinfo(CODESET). */ #undef HAVE_LANGINFO_CODESET -/* Define to 1 if you have the `com_err' library (-lcom_err). */ -#undef HAVE_LIBCOM_ERR - -/* Define to 1 if you have the `crypto' library (-lcrypto). */ -#undef HAVE_LIBCRYPTO - -/* Define to 1 if you have the `des' library (-ldes). */ -#undef HAVE_LIBDES - -/* Define to 1 if you have the `des425' library (-ldes425). */ -#undef HAVE_LIBDES425 - /* Define to 1 if you have the `dgc' library (-ldgc). */ #undef HAVE_LIBDGC @@ -683,21 +646,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LIBGEN_H -/* Define to 1 if you have the hesiod library (-lhesiod). */ -#undef HAVE_LIBHESIOD - -/* Define to 1 if you have the `k5crypto' library (-lk5crypto). */ -#undef HAVE_LIBK5CRYPTO - -/* Define to 1 if you have the `krb' library (-lkrb). */ -#undef HAVE_LIBKRB - -/* Define to 1 if you have the `krb4' library (-lkrb4). */ -#undef HAVE_LIBKRB4 - -/* Define to 1 if you have the `krb5' library (-lkrb5). */ -#undef HAVE_LIBKRB5 - /* Define to 1 if you have the `kstat' library (-lkstat). */ #undef HAVE_LIBKSTAT @@ -722,9 +670,6 @@ /* Define to 1 if you have the `pthreads' library (-lpthreads). */ #undef HAVE_LIBPTHREADS -/* Define to 1 if you have the resolv library (-lresolv). */ -#undef HAVE_LIBRESOLV - /* Define to 1 if using SELinux. */ #undef HAVE_LIBSELINUX @@ -737,9 +682,6 @@ /* Define to 1 if you have the `Xmu' library (-lXmu). */ #undef HAVE_LIBXMU -/* Define to 1 if you have the header file. */ -#undef HAVE_LINUX_VERSION_H - /* Define to 1 if you have the `localtime_r' function. */ #undef HAVE_LOCALTIME_R @@ -802,9 +744,6 @@ /* Define to 1 if you have a working `mmap' system call. */ #undef HAVE_MMAP -/* Define to 1 if you have the header file. */ -#undef HAVE_MMSYSTEM_H - /* Define to 1 if you have the `nanotime' function. */ #undef HAVE_NANOTIME @@ -939,9 +878,6 @@ /* Define to 1 if you have the header file. */ #undef HAVE_SOUNDCARD_H -/* Define to 1 if `speed_t' is declared by . */ -#undef HAVE_SPEED_T - /* Define to 1 if you have the `statacl' function. */ #undef HAVE_STATACL @@ -1128,9 +1064,6 @@ /* Define to 1 if you have the `utimensat' function. */ #undef HAVE_UTIMENSAT -/* Define to 1 if you have the `utimes' function. */ -#undef HAVE_UTIMES - /* Define to 1 if you have the header file. */ #undef HAVE_UTIME_H @@ -1561,9 +1494,6 @@ /* Define if the system is compatible with System III. */ #undef USG -/* Define if the system is compatible with System V. */ -#undef USG5 - /* Define if the system is compatible with System V Release 4. */ #undef USG5_4 @@ -1797,9 +1727,6 @@ /* Define to enable asynchronous subprocesses. */ #undef subprocesses -/* Define to any substitute for sys_siglist. */ -#undef sys_siglist - /* Define as a marker that can be attached to declarations that might not be used. This helps to reduce warnings, such as from GCC -Wunused-parameter. */ === modified file 'autogen/configure' --- autogen/configure 2013-07-02 10:17:36 +0000 +++ autogen/configure 2013-07-03 10:17:43 +0000 @@ -3352,7 +3352,6 @@ >$cache_file fi -as_fn_append ac_header_list " linux/version.h" as_fn_append ac_header_list " sys/systeminfo.h" as_fn_append ac_header_list " coff.h" as_fn_append ac_header_list " pty.h" @@ -8991,7 +8990,7 @@ if test "${with_sound}" != "no"; then # Sound support for GNU/Linux, the free BSDs, and MinGW. - for ac_header in machine/soundcard.h sys/soundcard.h soundcard.h mmsystem.h + for ac_header in machine/soundcard.h sys/soundcard.h soundcard.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" " @@ -9213,8 +9212,6 @@ - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if personality LINUX32 can be set" >&5 $as_echo_n "checking if personality LINUX32 can be set... " >&6; } cat confdefs.h - <<_ACEOF >conftest.$ac_ext @@ -9318,11 +9315,6 @@ #define HAVE_DECL___SYS_SIGLIST $ac_have_decl _ACEOF - if test $ac_cv_have_decl___sys_siglist = yes; then - -$as_echo "#define sys_siglist __sys_siglist" >>confdefs.h - - fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sys/wait.h that is POSIX.1 compatible" >&5 $as_echo_n "checking for sys/wait.h that is POSIX.1 compatible... " >&6; } @@ -9366,37 +9358,6 @@ fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for speed_t" >&5 -$as_echo_n "checking for speed_t... " >&6; } -if test "${emacs_cv_speed_t+set}" = set; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -#include -int -main () -{ -speed_t x = 1; - ; - return 0; -} -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - emacs_cv_speed_t=yes -else - emacs_cv_speed_t=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $emacs_cv_speed_t" >&5 -$as_echo "$emacs_cv_speed_t" >&6; } -if test $emacs_cv_speed_t = yes; then - -$as_echo "#define HAVE_SPEED_T 1" >>confdefs.h - -fi - @@ -11960,7 +11921,6 @@ HAVE_GNUTLS=no -HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=no if test "${with_gnutls}" = "yes" ; then succeeded=no @@ -12019,33 +11979,12 @@ fi - OLD_CFLAGS=$CFLAGS - OLD_LIBS=$LIBS - CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" - LIBS="$LIBGNUTLS_LIBS $LIBS" - for ac_func in gnutls_certificate_set_verify_function -do : - ac_fn_c_check_func "$LINENO" "gnutls_certificate_set_verify_function" "ac_cv_func_gnutls_certificate_set_verify_function" -if test "x$ac_cv_func_gnutls_certificate_set_verify_function" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_GNUTLS_CERTIFICATE_SET_VERIFY_FUNCTION 1 -_ACEOF - HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY=yes -fi -done - - - if test "${HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY}" = "yes"; then - -$as_echo "#define HAVE_GNUTLS_CALLBACK_CERTIFICATE_VERIFY 1" >>confdefs.h - - fi - # Windows loads GnuTLS dynamically if test "${opsys}" = "mingw32"; then - CFLAGS=$OLD_CFLAGS - LIBS=$OLD_LIBS LIBGNUTLS_LIBS= + else + CFLAGS="$CFLAGS $LIBGNUTLS_CFLAGS" + LIBS="$LIBGNUTLS_LIBS $LIBS" fi fi @@ -14720,7 +14659,7 @@ getrusage get_current_dir_name \ lrand48 \ select getpagesize setlocale \ -utimes getrlimit setrlimit shutdown getaddrinfo \ +getrlimit setrlimit shutdown getaddrinfo \ strsignal setitimer \ sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \ gai_strerror mkstemp getline getdelim sync \ @@ -15293,9 +15232,6 @@ if test x"$hesiod" = xyes; then - -$as_echo "#define HAVE_LIBHESIOD 1" >>confdefs.h - LIBHESIOD=-lhesiod fi fi @@ -15303,9 +15239,6 @@ # Do we need libresolv (due to res_init or Hesiod)? if test "$resolv" = yes && test $opsys != darwin; then - -$as_echo "#define HAVE_LIBRESOLV 1" >>confdefs.h - LIBRESOLV=-lresolv else LIBRESOLV= @@ -15365,9 +15298,6 @@ if test $have_com_err = yes; then COM_ERRLIB=-lcom_err LIBS="$COM_ERRLIB $LIBS" - -$as_echo "#define HAVE_LIBCOM_ERR 1" >>confdefs.h - fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in -lcrypto" >&5 $as_echo_n "checking for mit_des_cbc_encrypt in -lcrypto... " >&6; } @@ -15414,9 +15344,6 @@ if test $have_crypto = yes; then CRYPTOLIB=-lcrypto LIBS="$CRYPTOLIB $LIBS" - -$as_echo "#define HAVE_LIBCRYPTO 1" >>confdefs.h - fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for mit_des_cbc_encrypt in -lk5crypto" >&5 $as_echo_n "checking for mit_des_cbc_encrypt in -lk5crypto... " >&6; } @@ -15463,9 +15390,6 @@ if test $have_k5crypto = yes; then CRYPTOLIB=-lk5crypto LIBS="$CRYPTOLIB $LIBS" - -$as_echo "#define HAVE_LIBK5CRYPTO 1" >>confdefs.h - fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb5_init_context in -lkrb5" >&5 $as_echo_n "checking for krb5_init_context in -lkrb5... " >&6; } @@ -15512,9 +15436,6 @@ if test $have_krb5=yes; then KRB5LIB=-lkrb5 LIBS="$KRB5LIB $LIBS" - -$as_echo "#define HAVE_LIBKRB5 1" >>confdefs.h - fi if test "${with_kerberos5}" = no; then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes425" >&5 @@ -15562,9 +15483,6 @@ if test $have_des425 = yes; then DESLIB=-ldes425 LIBS="$DESLIB $LIBS" - -$as_echo "#define HAVE_LIBDES425 1" >>confdefs.h - else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for des_cbc_encrypt in -ldes" >&5 $as_echo_n "checking for des_cbc_encrypt in -ldes... " >&6; } @@ -15611,9 +15529,6 @@ if test $have_des = yes; then DESLIB=-ldes LIBS="$DESLIB $LIBS" - -$as_echo "#define HAVE_LIBDES 1" >>confdefs.h - fi fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in -lkrb4" >&5 @@ -15661,9 +15576,6 @@ if test $have_krb4 = yes; then KRB4LIB=-lkrb4 LIBS="$KRB4LIB $LIBS" - -$as_echo "#define HAVE_LIBKRB4 1" >>confdefs.h - else { $as_echo "$as_me:${as_lineno-$LINENO}: checking for krb_get_cred in -lkrb" >&5 $as_echo_n "checking for krb_get_cred in -lkrb... " >&6; } @@ -15710,9 +15622,6 @@ if test $have_krb = yes; then KRB4LIB=-lkrb LIBS="$KRB4LIB $LIBS" - -$as_echo "#define HAVE_LIBKRB 1" >>confdefs.h - fi fi fi @@ -15751,44 +15660,6 @@ done else - for ac_header in des.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "des.h" "ac_cv_header_des_h" "$ac_includes_default" -if test "x$ac_cv_header_des_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_DES_H 1 -_ACEOF - -else - for ac_header in kerberosIV/des.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "kerberosIV/des.h" "ac_cv_header_kerberosIV_des_h" "$ac_includes_default" -if test "x$ac_cv_header_kerberosIV_des_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_KERBEROSIV_DES_H 1 -_ACEOF - -else - for ac_header in kerberos/des.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "kerberos/des.h" "ac_cv_header_kerberos_des_h" "$ac_includes_default" -if test "x$ac_cv_header_kerberos_des_h" = x""yes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_KERBEROS_DES_H 1 -_ACEOF - -fi - -done - -fi - -done - -fi - -done - for ac_header in krb.h do : ac_fn_c_check_header_mongrel "$LINENO" "krb.h" "ac_cv_header_krb_h" "$ac_includes_default" @@ -15958,25 +15829,6 @@ fi -if test -f /usr/lpp/X11/bin/smt.exp; then - -$as_echo "#define HAVE_AIX_SMT_EXP 1" >>confdefs.h - -fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether system supports dynamic ptys" >&5 -$as_echo_n "checking whether system supports dynamic ptys... " >&6; } -if test -d /dev/pts && ls -d /dev/ptmx > /dev/null 2>&1 ; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } - -$as_echo "#define HAVE_DEV_PTMX 1" >>confdefs.h - -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } -fi - case $canonical in *-solaris2.4 | *-solaris2.4.*) : ${ac_cv_func_vfork_works=no};; @@ -16409,12 +16261,9 @@ $as_echo "#define DIRECTORY_SEP '/'" >>confdefs.h - if test "${opsys}" = "mingw32"; then - $as_echo "#define DEVICE_SEP ':'" >>confdefs.h - - -$as_echo "#define IS_DEVICE_SEP(_c_) ((_c_) == DEVICE_SEP)" >>confdefs.h + +$as_echo "#define IS_DEVICE_SEP(_c_) ((_c_) == ':')" >>confdefs.h @@ -16466,7 +16315,7 @@ emacs_broken_SIGIO=no case $opsys in - hpux* | irix6-5 | openbsd | sol2* | unixware ) + hpux* | irix6-5 | openbsd | sol2* | unixware | gnu-kfreebsd ) emacs_broken_SIGIO=yes ;; @@ -16898,13 +16747,10 @@ - case $opsys in aix4-2) $as_echo "#define USG /**/" >>confdefs.h - $as_echo "#define USG5 /**/" >>confdefs.h - cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -16953,8 +16799,6 @@ hpux*) $as_echo "#define USG /**/" >>confdefs.h - $as_echo "#define USG5 /**/" >>confdefs.h - $as_echo "#define HPUX /**/" >>confdefs.h @@ -16963,8 +16807,6 @@ irix6-5) $as_echo "#define USG /**/" >>confdefs.h - $as_echo "#define USG5 /**/" >>confdefs.h - $as_echo "#define USG5_4 /**/" >>confdefs.h @@ -16988,8 +16830,6 @@ sol2*) $as_echo "#define USG /**/" >>confdefs.h - $as_echo "#define USG5 /**/" >>confdefs.h - $as_echo "#define USG5_4 /**/" >>confdefs.h @@ -17000,8 +16840,6 @@ unixware) $as_echo "#define USG /**/" >>confdefs.h - $as_echo "#define USG5 /**/" >>confdefs.h - $as_echo "#define USG5_4 /**/" >>confdefs.h ;; ------------------------------------------------------------ revno: 113269 committer: Katsumi Yamaoka branch nick: trunk timestamp: Wed 2013-07-03 04:15:38 +0000 message: gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): Revert 2013-01-14 change diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-07-02 10:38:58 +0000 +++ lisp/gnus/ChangeLog 2013-07-03 04:15:38 +0000 @@ -1,3 +1,8 @@ +2013-07-03 Katsumi Yamaoka + + * gnus-sum.el (gnus-summary-from-or-to-or-newsgroups): + Revert 2013-01-14 change. + 2013-07-02 David Engster * gnus-sum.el (gnus-update-marks): Do not remove empty 'unexist' === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2013-07-02 10:38:58 +0000 +++ lisp/gnus/gnus-sum.el 2013-07-03 04:15:38 +0000 @@ -3657,18 +3657,17 @@ (or (car (funcall gnus-extract-address-components from)) from)) -(defun gnus-summary-from-or-to-or-newsgroups (header from) +(defun gnus-summary-from-or-to-or-newsgroups (header gnus-tmp-from) (let ((mail-parse-charset gnus-newsgroup-charset) - (ignored-from-addresses (gnus-ignored-from-addresses)) - ;; Is it really necessary to do this next part for each summary line? - ;; Luckily, doesn't seem to slow things down much. - (mail-parse-ignored-charsets - (with-current-buffer gnus-summary-buffer - gnus-newsgroup-ignored-charsets)) - (address (cadr (gnus-extract-address-components from)))) + (ignored-from-addresses (gnus-ignored-from-addresses)) + ;; Is it really necessary to do this next part for each summary line? + ;; Luckily, doesn't seem to slow things down much. + (mail-parse-ignored-charsets + (with-current-buffer gnus-summary-buffer + gnus-newsgroup-ignored-charsets))) (or (and ignored-from-addresses - (string-match ignored-from-addresses address) + (string-match ignored-from-addresses gnus-tmp-from) (let ((extra-headers (mail-header-extra header)) to newsgroups) @@ -3683,11 +3682,13 @@ (cdr (assq 'Newsgroups extra-headers)) (and (memq 'Newsgroups gnus-extra-headers) - (eq (car (gnus-find-method-for-group - gnus-newsgroup-name)) 'nntp) + (eq (car (gnus-find-method-for-group + gnus-newsgroup-name)) 'nntp) (gnus-group-real-name gnus-newsgroup-name)))) (concat gnus-summary-newsgroup-prefix newsgroups))))) - (gnus-string-mark-left-to-right (gnus-summary-extract-address-component from))))) + (gnus-string-mark-left-to-right + (inline + (gnus-summary-extract-address-component gnus-tmp-from)))))) (defun gnus-summary-insert-line (gnus-tmp-header gnus-tmp-level gnus-tmp-current