------------------------------------------------------------ revno: 114649 committer: Xue Fuqiao branch nick: trunk timestamp: Sun 2013-10-13 20:14:28 +0800 message: NEWS tweak. diff: === modified file 'etc/NEWS' --- etc/NEWS 2013-10-08 17:49:20 +0000 +++ etc/NEWS 2013-10-13 12:14:28 +0000 @@ -182,9 +182,9 @@ ** C-x TAB enters a transient interactive mode. You can then use the left/right cursor keys to move the block of text. -** `tab-stop-list' is now implicitly extended to infinity. -Its default value is changed to nil which means a tab stop every -`tab-width' columns. +** `tab-stop-list' is now implicitly extended to infinity by repeating +the last step. Its default value is changed to nil which means a tab +stop every `tab-width' columns. ** `split-window' is no longer a command, just a non-interactive function. As a command it was a special case of `split-window-below', and as such ------------------------------------------------------------ revno: 114648 [merge] committer: K. Handa branch nick: trunk timestamp: Sun 2013-10-13 21:01:34 +0900 message: international/mule-cmds.el (select-safe-coding-system): Remove a superfluous condition in chekcing whether a coding system is safe or not. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-10-13 05:30:23 +0000 +++ lisp/ChangeLog 2013-10-13 11:55:00 +0000 @@ -1,3 +1,9 @@ +2013-10-13 Kenichi Handa + + * international/mule-cmds.el (select-safe-coding-system): Remove a + superfluous condition in chekcing whether a coding system is safe + or not. + 2013-10-13 Oleh Krehel * replace.el (how-many): Fix rstart and !rend case. (Bug#15589) === modified file 'lisp/international/mule-cmds.el' --- lisp/international/mule-cmds.el 2013-09-05 03:46:34 +0000 +++ lisp/international/mule-cmds.el 2013-10-13 09:25:29 +0000 @@ -976,13 +976,17 @@ ;; Classify the defaults into safe, rejected, and unsafe. (dolist (elt default-coding-system) - (if (or (eq (coding-system-type (car elt)) 'undecided) - (memq (cdr elt) codings)) + (if (memq (cdr elt) codings) + ;; This is safe. Is it acceptable? (if (and (functionp accept-default-p) (not (funcall accept-default-p (cdr elt)))) + ;; No, not acceptable. (push (car elt) rejected) + ;; Yes, acceptable. (push (car elt) safe)) + ;; This is not safe. (push (car elt) unsafe))) + ;; If there are safe ones, the first one is what we want. (if safe (setq coding-system (car safe)))) ------------------------------------------------------------ revno: 114647 committer: Xue Fuqiao branch nick: trunk timestamp: Sun 2013-10-13 18:22:34 +0800 message: Remove unnecessary @refill. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2013-10-13 05:17:42 +0000 +++ doc/emacs/ChangeLog 2013-10-13 10:22:34 +0000 @@ -1,3 +1,7 @@ +2013-10-13 Xue Fuqiao + + * calendar.texi (Special Diary Entries): Remove @refill. + 2013-10-13 Glenn Morris * display.texi (Text Scale): Update text-scale-adjust details. === modified file 'doc/emacs/calendar.texi' --- doc/emacs/calendar.texi 2013-07-31 11:38:13 +0000 +++ doc/emacs/calendar.texi 2013-10-13 10:22:34 +0000 @@ -1347,7 +1347,7 @@ The month can be a single month or a list of months. Thus you could change the 11 above to @samp{'(1 2 3)} and have the entry apply to the last Thursday of January, February, and March. If the month is @code{t}, the -entry applies to all months of the year.@refill +entry applies to all months of the year. Each of the standard sexp diary entries takes an optional parameter specifying the name of a face or a single-character string to use when ------------------------------------------------------------ revno: 114646 committer: Glenn Morris branch nick: trunk timestamp: Sun 2013-10-13 06:19:27 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/Makefile.in' --- autogen/Makefile.in 2013-10-08 10:17:43 +0000 +++ autogen/Makefile.in 2013-10-13 10:19:27 +0000 @@ -1105,6 +1105,7 @@ REPLACE_STRTOD = @REPLACE_STRTOD@ REPLACE_STRTOIMAX = @REPLACE_STRTOIMAX@ REPLACE_STRTOK_R = @REPLACE_STRTOK_R@ +REPLACE_STRTOUMAX = @REPLACE_STRTOUMAX@ REPLACE_STRUCT_TIMEVAL = @REPLACE_STRUCT_TIMEVAL@ REPLACE_SYMLINK = @REPLACE_SYMLINK@ REPLACE_TIMEGM = @REPLACE_TIMEGM@ @@ -2052,6 +2053,7 @@ @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \ +@BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \ @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \ @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \ @BUILDING_FOR_WINDOWSNT_FALSE@ -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \ === modified file 'autogen/configure' --- autogen/configure 2013-10-12 10:17:41 +0000 +++ autogen/configure 2013-10-13 10:19:27 +0000 @@ -910,6 +910,7 @@ PRI_MACROS_BROKEN INT64_MAX_EQ_LONG_MAX INT32_MAX_LT_INTMAX_MAX +REPLACE_STRTOUMAX REPLACE_STRTOIMAX HAVE_DECL_STRTOUMAX HAVE_DECL_STRTOIMAX @@ -20969,6 +20970,7 @@ HAVE_DECL_STRTOIMAX=1; HAVE_DECL_STRTOUMAX=1; REPLACE_STRTOIMAX=0; + REPLACE_STRTOUMAX=0; INT32_MAX_LT_INTMAX_MAX=1; INT64_MAX_EQ_LONG_MAX='defined _LP64'; PRI_MACROS_BROKEN=0; @@ -27035,7 +27037,7 @@ HAVE_DECL_STRTOIMAX=0 fi - if test $ac_cv_func_strtoimax = yes; then + if test "$ac_cv_func_strtoimax" = yes; then HAVE_STRTOIMAX=1 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether strtoimax works" >&5 $as_echo_n "checking whether strtoimax works... " >&6; } @@ -27108,10 +27110,14 @@ *no) REPLACE_STRTOIMAX=1 ;; esac else + if test "$ac_cv_have_decl_strtoimax" = yes; then + # HP-UX 11.11 has "#define strtoimax(...) ..." but no function. + REPLACE_STRTOIMAX=1 + fi HAVE_STRTOIMAX=0 fi - if test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then + if test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then @@ -27152,11 +27158,16 @@ - if test "$ac_cv_have_decl_strtoumax" != yes; then + if test "$ac_cv_have_decl_strtoumax" = yes; then + if test "$ac_cv_func_strtoumax" != yes; then + # HP-UX 11.11 has "#define strtoimax(...) ..." but no function. + REPLACE_STRTOUMAX=1 + fi + else HAVE_DECL_STRTOUMAX=0 fi - if test $ac_cv_func_strtoumax = no; then + if test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then @@ -29126,10 +29137,10 @@ if test $HAVE_READLINKAT = 0; then func_gl_gnulib_m4code_03e0aaad4cb89ca757653bd367a6ccb7 fi - if { test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; } && test $ac_cv_type_long_long_int = yes; then + if { test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; } && test $ac_cv_type_long_long_int = yes; then func_gl_gnulib_m4code_strtoll fi - if test $ac_cv_func_strtoumax = no && test $ac_cv_type_unsigned_long_long_int = yes; then + if { test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; } && test $ac_cv_type_unsigned_long_long_int = yes; then func_gl_gnulib_m4code_strtoull fi ------------------------------------------------------------ revno: 114645 fixes bug: http://debbugs.gnu.org/15589 author: Oleh Krehel committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-10-12 22:30:23 -0700 message: * lisp/replace.el (how-many): Fix rstart and !rend case. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-10-13 05:23:42 +0000 +++ lisp/ChangeLog 2013-10-13 05:30:23 +0000 @@ -1,3 +1,7 @@ +2013-10-13 Oleh Krehel + + * replace.el (how-many): Fix rstart and !rend case. (Bug#15589) + 2013-10-13 Andreas Politz * progmodes/sql.el (sql-add-product): Fix paren typo. (Bug#15435) === modified file 'lisp/replace.el' --- lisp/replace.el 2013-09-06 01:38:45 +0000 +++ lisp/replace.el 2013-10-13 05:30:23 +0000 @@ -810,9 +810,12 @@ (keep-lines-read-args "How many matches for regexp")) (save-excursion (if rstart - (progn - (goto-char (min rstart rend)) - (setq rend (max rstart rend))) + (if rend + (progn + (goto-char (min rstart rend)) + (setq rend (max rstart rend))) + (goto-char rstart) + (setq rend (point-max))) (if (and interactive transient-mark-mode mark-active) (setq rstart (region-beginning) rend (region-end)) ------------------------------------------------------------ revno: 114644 fixes bug: http://debbugs.gnu.org/15435 author: Andreas Politz committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-10-12 22:23:42 -0700 message: * lisp/progmodes/sql.el (sql-add-product): Fix paren typo. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-10-13 05:20:15 +0000 +++ lisp/ChangeLog 2013-10-13 05:23:42 +0000 @@ -1,3 +1,7 @@ +2013-10-13 Andreas Politz + + * progmodes/sql.el (sql-add-product): Fix paren typo. (Bug#15435) + 2013-10-13 Glenn Morris * menu-bar.el (menu-bar-update-buffers): === modified file 'lisp/progmodes/sql.el' --- lisp/progmodes/sql.el 2013-07-24 00:25:53 +0000 +++ lisp/progmodes/sql.el 2013-10-13 05:23:42 +0000 @@ -2439,7 +2439,7 @@ (user-error "Product `%s' is already defined" product) ;; Add product to the alist - (add-to-list 'sql-product-alist `((,product :name ,display . ,plist))) + (add-to-list 'sql-product-alist `(,product :name ,display . ,plist)) ;; Add a menu item to the SQL->Product menu (easy-menu-add-item sql-mode-menu '("Product") ;; Each product is represented by a radio ------------------------------------------------------------ revno: 114643 fixes bug: http://debbugs.gnu.org/15576 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-10-12 22:20:15 -0700 message: * menu-bar.el (menu-bar-update-buffers): Unify Buffers menu prompt string. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-10-13 05:17:42 +0000 +++ lisp/ChangeLog 2013-10-13 05:20:15 +0000 @@ -1,5 +1,8 @@ 2013-10-13 Glenn Morris + * menu-bar.el (menu-bar-update-buffers): + Unify Buffers menu prompt string. (Bug#15576) + * face-remap.el (text-scale-adjust): Doc fix. (Bug#15434) * emacs-lisp/authors.el (authors-aliases, authors-ignored-files): === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2013-10-11 18:20:08 +0000 +++ lisp/menu-bar.el 2013-10-13 05:20:15 +0000 @@ -2046,7 +2046,7 @@ ;; We used to "(define-key (current-global-map) [menu-bar buffer]" ;; but that did not do the right thing when the [menu-bar buffer] ;; entry above had been moved (e.g. to a parent keymap). - (setcdr global-buffers-menu-map (cons "Select Buffer" buffers-menu))))) + (setcdr global-buffers-menu-map (cons "Buffers" buffers-menu))))) (add-hook 'menu-bar-update-hook 'menu-bar-update-buffers) ------------------------------------------------------------ revno: 114642 fixes bug: http://debbugs.gnu.org/15434 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-10-12 22:17:42 -0700 message: Doc fixes for text-scale-adjust * lisp/face-remap.el (text-scale-adjust): Doc fix. * doc/emacs/display.texi (Text Scale): Update text-scale-adjust details. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2013-10-13 00:31:19 +0000 +++ doc/emacs/ChangeLog 2013-10-13 05:17:42 +0000 @@ -1,5 +1,7 @@ 2013-10-13 Glenn Morris + * display.texi (Text Scale): Update text-scale-adjust details. + * ack.texi (Acknowledgments): * emacs.texi (Acknowledgments): Use accented form of some names. === modified file 'doc/emacs/display.texi' --- doc/emacs/display.texi 2013-10-02 17:27:52 +0000 +++ doc/emacs/display.texi 2013-10-13 05:17:42 +0000 @@ -743,9 +743,9 @@ @kbd{C-x}. For instance, @kbd{C-x C-= C-= C-=} increases the face height by three steps. Each step scales the text height by a factor of 1.2; to change this factor, customize the variable -@code{text-scale-mode-step}. As an exception, a numeric argument of 0 +@code{text-scale-mode-step}. A numeric argument of 0 to the @code{text-scale-adjust} command restores the default height, -similar to typing @kbd{C-x C-0}. +the same as typing @kbd{C-x C-0}. @cindex increase buffer face height @findex text-scale-increase === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-10-13 00:31:19 +0000 +++ lisp/ChangeLog 2013-10-13 05:17:42 +0000 @@ -1,5 +1,7 @@ 2013-10-13 Glenn Morris + * face-remap.el (text-scale-adjust): Doc fix. (Bug#15434) + * emacs-lisp/authors.el (authors-aliases, authors-ignored-files): Add some entries. (authors-fixed-entries): Use accented form of name. === modified file 'lisp/face-remap.el' --- lisp/face-remap.el 2013-06-18 10:52:07 +0000 +++ lisp/face-remap.el 2013-10-13 05:17:42 +0000 @@ -299,11 +299,9 @@ - Decrease the default face height by one step 0 Reset the default face height to the global default -When adjusting with `+' or `-', continue to read input events and -further adjust the face height as long as the input event read -\(with all modifiers removed) is `+' or `-'. - -When adjusting with `0', immediately finish. +After adjusting, continue to read input events and further adjust +the face height as long as the input event read +\(with all modifiers removed) is one of the above characters. Each step scales the height of the default face by the variable `text-scale-mode-step' (a negative number of steps decreases the ------------------------------------------------------------ revno: 114641 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-10-12 17:31:19 -0700 message: Use accented form of some names * doc/emacs/ack.texi (Acknowledgments): * doc/emacs/emacs.texi (Acknowledgments): * doc/lispref/intro.texi (Acknowledgments): Use accented form of some names. * lisp/emacs-lisp/authors.el (authors-aliases, authors-ignored-files): Add some entries. (authors-fixed-entries): Use accented form of name. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2013-10-08 18:42:25 +0000 +++ doc/emacs/ChangeLog 2013-10-13 00:31:19 +0000 @@ -1,3 +1,8 @@ +2013-10-13 Glenn Morris + + * ack.texi (Acknowledgments): + * emacs.texi (Acknowledgments): Use accented form of some names. + 2013-10-08 Eli Zaretskii * ack.texi (Acknowledgments): Fix spelling of Hrvoje Nikšić's === modified file 'doc/emacs/ack.texi' --- doc/emacs/ack.texi 2013-10-08 18:42:25 +0000 +++ doc/emacs/ack.texi 2013-10-13 00:31:19 +0000 @@ -104,7 +104,7 @@ @item Alexander L. Belikoff, Sergey Berezin, Sacha Chua, David Edmondson, Noah Friedman, Andreas Fuchs, Mario Lang, Ben Mesander, Lawrence -Mitchell, Gergely Nagy, Michael Olson, Per Persson, Jorgen Schaefer, +Mitchell, Gergely Nagy, Michael Olson, Per Persson, Jorgen Schäfer, Alex Schroeder, and Tom Tromey wrote ERC, an advanced Internet Relay Chat client (for more information, see the file @file{CREDITS} in the ERC distribution). @@ -276,7 +276,7 @@ Borgman, Baoqiu Cui, Dan Davison, Christian Egli, Eric S. Fraga, Daniel German, Chris Gray, Konrad Hinsen, Tassilo Horn, Philip Jackson, Martyn Jago, Thorsten Jolitz, Jambunathan K, Tokuya Kameshima, Sergey Litvinov, David Maus, Ross Patterson, Juan Pechiar, Sebastian Rose, Eric Schulte, Paul Sexton, Ulf Stegemann, Andy Stewart, Christopher Suckling, David O'Toole, John Wiegley, Zhang Weize, -Piotr Zielinski, and others also wrote various Org mode components. +Piotr Zieliński, and others also wrote various Org mode components. For more information, @pxref{History and Acknowledgments,,, org, The Org Manual}. @item @@ -819,7 +819,7 @@ terminal emulator for Emacs subprocesses. @item -Gerd Moellmann was the Emacs maintainer from the beginning of Emacs 21 +Gerd Möllmann was the Emacs maintainer from the beginning of Emacs 21 development until the release of 21.1. He wrote the new display engine used from Emacs 21 onwards, and the asynchronous timers facility. He also wrote @code{ebrowse}, the C@t{++} browser; @@ -979,7 +979,7 @@ structures. @item -Francesco A. Potorti wrote @file{cmacexp.el}, providing a command which +Francesco A. Potortì wrote @file{cmacexp.el}, providing a command which runs the C preprocessor on a region of a file and displays the results. He also expanded and redesigned the @code{etags} program. @@ -1099,8 +1099,9 @@ Philippe Schnoebelen wrote @file{gomoku.el}, a Go Moku game played against Emacs; and @file{mpuz.el}, a multiplication puzzle. +@c FIXME files no longer included; but see bug 15601. @item -Rainer Schoepf contributed to Alpha and OSF1 support. +Rainer Schöpf contributed to Alpha and OSF1 support. @item Jan Schormann wrote @file{solitaire.el}, an implementation of the === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2013-09-26 13:42:29 +0000 +++ doc/emacs/emacs.texi 2013-10-13 00:31:19 +0000 @@ -1416,18 +1416,18 @@ Brian Marick, Simon Marshall, Bengt Martensson, Charlie Martin, Yukihiro Matsumoto, Tomohiro Matsuyama, David Maus, Thomas May, Will Mengarini, David Megginson, Stefan Merten, Ben A. Mesander, Wayne Mesard, Brad -Miller, Lawrence Mitchell, Richard Mlynarik, Gerd Moellmann, Stefan +Miller, Lawrence Mitchell, Richard Mlynarik, Gerd Möllmann, Stefan Monnier, Keith Moore, Jan Moringen, Morioka Tomohiko, Glenn Morris, Don Morrison, Diane Murray, Riccardo Murri, Sen Nagata, Erik Naggum, Gergely Nagy, Nobuyoshi Nakada, Thomas Neumann, Mike Newton, Thien-Thi Nguyen, -Jurgen Nickelsen, Dan Nicolaescu, Hrvoje Niksic, Jeff Norden, +Jurgen Nickelsen, Dan Nicolaescu, Hrvoje Nikšić, Jeff Norden, Andrew Norman, Edward O'Connor, Kentaro Ohkouchi, Christian Ohler, Kenichi Okada, Alexandre Oliva, Bob Olson, Michael Olson, Takaaki Ota, Pieter E. J. Pareit, Ross Patterson, David Pearson, Juan Pechiar, Jeff Peck, Damon Anton Permezel, Tom Perrine, William M. Perry, Per Persson, Jens Petersen, Daniel Pfeiffer, Justus Piater, Richard L. Pieri, Fred Pierresteguy, François Pinard, Daniel Pittman, Christian -Plaunt, Alexander Pohoyda, David Ponce, Francesco A. Potorti, +Plaunt, Alexander Pohoyda, David Ponce, Francesco A. Potortì, Michael D. Prange, Mukesh Prasad, Ken Raeburn, Marko Rahamaa, Ashwin Ram, Eric S. Raymond, Paul Reilly, Edward M. Reingold, David Reitter, Alex Rezinsky, Rob Riepel, Lara Rios, Adrian Robert, Nick @@ -1435,10 +1435,10 @@ Roozendaal, Sebastian Rose, William Rosenblatt, Markus Rost, Guillermo J. Rozas, Martin Rudalics, Ivar Rummelhoff, Jason Rumney, Wolfgang Rupprecht, Benjamin Rutt, Kevin Ryde, James B. Salem, Masahiko Sato, -Timo Savola, Jorgen Schaefer, Holger Schauer, William Schelter, Ralph +Timo Savola, Jorgen Schäfer, Holger Schauer, William Schelter, Ralph Schleicher, Gregor Schmid, Michael Schmidt, Ronald S. Schnell, Philippe Schnoebelen, Jan Schormann, Alex Schroeder, Stefan Schoef, -Rainer Schoepf, Raymond Scholz, Eric Schulte, Andreas Schwab, Randal +Rainer Schöpf, Raymond Scholz, Eric Schulte, Andreas Schwab, Randal Schwartz, Oliver Seidel, Manuel Serrano, Paul Sexton, Hovav Shacham, Stanislav Shalunov, Marc Shapiro, Richard Sharman, Olin Shivers, Tibor Šimko, Espen Skoglund, Rick Sladkey, Lynn Slater, Chris Smith, @@ -1460,7 +1460,7 @@ S. T. Wu, Tom Wurgler, Yamamoto Mitsuharu, Katsumi Yamaoka, Masatake Yamato, Jonathan Yavner, Ryan Yeske, Ilya Zakharevich, Milan Zamazal, Victor Zandy, Eli Zaretskii, Jamie Zawinski, Andrew Zhilin, -Shenghuo Zhu, Piotr Zielinski, Ian T. Zimmermann, Reto Zimmermann, +Shenghuo Zhu, Piotr Zieliński, Ian T. Zimmermann, Reto Zimmermann, Neal Ziring, Teodor Zlatanov, and Detlev Zundel. @end iftex === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2013-10-09 17:17:20 +0000 +++ doc/lispref/ChangeLog 2013-10-13 00:31:19 +0000 @@ -1,3 +1,7 @@ +2013-10-13 Glenn Morris + + * intro.texi (Acknowledgments): Use accented form of some names. + 2013-10-09 Glenn Morris * control.texi (Conditionals): Copyedits. (Bug#15558) === modified file 'doc/lispref/intro.texi' --- doc/lispref/intro.texi 2013-03-04 08:45:03 +0000 +++ doc/lispref/intro.texi 2013-10-13 00:31:19 +0000 @@ -545,7 +545,7 @@ Harder, George Hartzell, Nathan Hess, Masayuki Ida, Dan Jacobson, Jak Kirman, Bob Knighten, Frederick M. Korz, Joe Lammens, Glenn M. Lewis, K. Richard Magill, Brian Marick, Roland McGrath, Stefan Monnier, Skip -Montanaro, John Gardiner Myers, Thomas A. Peterson, Francesco Potorti, +Montanaro, John Gardiner Myers, Thomas A. Peterson, Francesco Potortì, Friedrich Pukelsheim, Arnold D. Robbins, Raul Rockwell, Jason Rumney, Per Starbäck, Shinichirou Sugou, Kimmo Suominen, Edward Tharp, Bill Trost, Rickard Westman, Jean White, Eduard Wiebe, Matthew Wilding, === modified file 'doc/misc/gnus.texi' --- doc/misc/gnus.texi 2013-08-12 01:48:11 +0000 +++ doc/misc/gnus.texi 2013-10-13 00:31:19 +0000 @@ -22998,7 +22998,7 @@ additional elements on the mode line (e.g., a clock), you should modify this variable: -@c Hook written by Francesco Potorti` +@c Hook written by Francesco Potortì @lisp (add-hook 'display-time-hook (lambda () (setq gnus-mode-non-string-length === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-10-13 00:28:30 +0000 +++ lisp/ChangeLog 2013-10-13 00:31:19 +0000 @@ -1,3 +1,9 @@ +2013-10-13 Glenn Morris + + * emacs-lisp/authors.el (authors-aliases, authors-ignored-files): + Add some entries. + (authors-fixed-entries): Use accented form of name. + 2013-10-12 Stefan Monnier * progmodes/ruby-mode.el (ruby-smie-grammar): Add rule for paren-free === modified file 'lisp/desktop.el' --- lisp/desktop.el 2013-10-10 01:03:11 +0000 +++ lisp/desktop.el 2013-10-13 00:31:19 +0000 @@ -123,7 +123,7 @@ ;; f89-kam@nada.kth.se (Klas Mellbourn) for a mh-e tip. ;; kifer@sbkifer.cs.sunysb.edu (M. Kifer) for a bug hunt. ;; treese@lcs.mit.edu (Win Treese) for ange-ftp tips. -;; pot@cnuce.cnr.it (Francesco Potorti`) for misc. tips. +;; pot@cnuce.cnr.it (Francesco Potortì) for misc. tips. ;; --------------------------------------------------------------------------- ;; TODO: ;; @@ -1467,3 +1467,7 @@ (provide 'desktop) ;;; desktop.el ends here + +;; Local Variables: +;; coding: utf-8 +;; End: === modified file 'lisp/emacs-lisp/authors.el' --- lisp/emacs-lisp/authors.el 2013-10-09 17:10:08 +0000 +++ lisp/emacs-lisp/authors.el 2013-10-13 00:31:19 +0000 @@ -103,6 +103,7 @@ ("John J Foerch" "John Foerch") ("John W. Eaton" "John Eaton") ("Jonathan I. Kamens" "Jonathan Kamens") + ("Jorgen Schäfer" "Jorgen Schaefer") ("Joseph Arceneaux" "Joe Arceneaux") ("Joseph M. Kelsey" "Joe Kelsey") ; FIXME ? ("Juan León Lahoz García" "Juan-Leon Lahoz Garcia") @@ -145,6 +146,8 @@ ("Peter S. Galbraith" "Peter Galbraith") ("Peter Runestig" "Peter 'luna' Runestig") ("Peter S. Galbraith" "Peter S Galbraith") + ("Piotr Zieliński" "Piotr Zielinski") + ("Rainer Schöpf" "Rainer Schoepf") ("Raja R. Harinath" "Raja R Harinath") ("Richard G. Bielawski" "Richard G Bielawski" "Richard Bielawski") ("Richard King" "Dick King") @@ -297,7 +300,7 @@ "NICKLES.WORTH" "INTERVAL.IDEAS" "RCP" "3B-MAXMEM" "AIX.DUMP" "SUN-SUPPORT" "XENIX" "CODINGS" "CHARSETS" - "calc/INSTALL" "calc/Makefile" + "calc/INSTALL" "calc/Makefile" "calc/README.prev" "vms-pp.trans" "_emacs" "batcomp.com" "notes/cpp" ; admin/ "emacsver.texi.in" "vpath.sed" @@ -334,6 +337,15 @@ "debian/scripts/startup" "debian/scripts/startup.erc" "debian/scripts/startup.erc-speak" + ;; Used to be in admin, not very interesting. + "emacs-pretesters" "make-announcement" "make-changelog-diff" + ;; Generated files that have since been removed. + "refcards/calccard.pdf" "refcards/cs-dired-ref.pdf" "refcards/cs-refcard.pdf" + "refcards/de-refcard.pdf" "refcards/dired-ref.pdf" "refcards/fr-dired-ref.pdf" + "refcards/fr-refcard.pdf" "refcards/gnus-booklet.pdf" "refcards/gnus-refcard.pdf" + "refcards/orgcard.pdf" "refcards/pl-refcard.pdf" "refcards/pt-br-refcard.pdf" + "refcards/refcard.pdf" "refcards/ru-refcard.pdf" "refcards/sk-dired-ref.pdf" + "refcards/sk-refcard.pdf" ) "List of files and directories to ignore. Changes to files in this list are not listed.") @@ -506,7 +518,8 @@ ("Schlumberger Technology Corporation" :changed "gud.el") ;; Replaced by tcl.el. ;;; ("Gregor Schmid" :wrote "tcl-mode.el") - ("Rainer Schoepf" :wrote "alpha.h" "unexalpha.c") + ;; FIXME files no longer included; but see bug 15601 + ("Rainer Schöpf" :wrote "alpha.h" "unexalpha.c") ;; No longer distributed: emacsserver.c. ("William Sommerfeld" :wrote "emacsclient.c" "scribe.el") ;; No longer distributed: emacsserver.c. === modified file 'lisp/emacs-lisp/shadow.el' --- lisp/emacs-lisp/shadow.el 2013-04-26 07:25:45 +0000 +++ lisp/emacs-lisp/shadow.el 2013-10-13 00:31:19 +0000 @@ -45,7 +45,7 @@ ;; ;; emacs -batch -f list-load-path-shadows ;; -;; Thanks to Francesco Potorti` for suggestions, +;; Thanks to Francesco Potortì for suggestions, ;; rewritings & speedups. ;;; Code: @@ -284,3 +284,7 @@ (provide 'shadow) ;;; shadow.el ends here + +;; Local Variables: +;; coding: utf-8 +;; End: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2013-09-18 04:54:21 +0000 +++ lisp/gnus/ChangeLog 2013-10-13 00:31:19 +0000 @@ -1138,7 +1138,7 @@ 2013-02-25 Adam Sjøgren - * mml2015-el (mml2015-epg-key-image): Wrap epg-gpg-program in + * mml2015.el (mml2015-epg-key-image): Wrap epg-gpg-program in shell-quote-argument. 2013-02-22 David Engster === modified file 'lisp/mail/uce.el' --- lisp/mail/uce.el 2013-01-01 09:11:05 +0000 +++ lisp/mail/uce.el 2013-10-13 00:31:19 +0000 @@ -88,7 +88,7 @@ ;; Dec 10, 1996 -- posted draft version to gnu.sources.emacs -;; Dec 11, 1996 -- fixed some typos, and Francesco Potorti` +;; Dec 11, 1996 -- fixed some typos, and Francesco Potortì ;; pointed out that my use of defvar was ;; weird, suggested fix, and added let form. @@ -375,3 +375,7 @@ (provide 'uce) ;;; uce.el ends here + +;; Local Variables: +;; coding: utf-8 +;; End: === modified file 'lisp/man.el' --- lisp/man.el 2013-09-11 03:31:56 +0000 +++ lisp/man.el 2013-10-13 00:31:19 +0000 @@ -55,7 +55,7 @@ ;; point and some other names have been changed to make it a drop-in ;; replacement for the old man.el package. -;; Francesco Potorti` cleaned it up thoroughly, +;; Francesco Potortì cleaned it up thoroughly, ;; making it faster, more robust and more tolerant of different ;; systems' man idiosyncrasies. === modified file 'lisp/progmodes/cmacexp.el' --- lisp/progmodes/cmacexp.el 2013-01-01 09:11:05 +0000 +++ lisp/progmodes/cmacexp.el 2013-10-13 00:31:19 +0000 @@ -1,9 +1,8 @@ ;;; cmacexp.el --- expand C macros in a region -;; Copyright (C) 1992, 1994, 1996, 2000-2013 Free Software Foundation, -;; Inc. +;; Copyright (C) 1992, 1994, 1996, 2000-2013 Free Software Foundation, Inc. -;; Author: Francesco Potorti` +;; Author: Francesco Potortì ;; Adapted-By: ESR ;; Keywords: c @@ -70,7 +69,7 @@ ;; BUG REPORTS ======================================================= ;; Please report bugs, suggestions, complaints and so on to -;; pot@gnu.org (Francesco Potorti`). +;; bug-gnu-emacs@gnu.org and pot@gnu.org (Francesco Potortì). ;; IMPROVEMENTS OVER emacs 18.xx cmacexp.el ========================== @@ -404,3 +403,7 @@ (kill-buffer outbuf)))) ;;; cmacexp.el ends here + +;; Local Variables: +;; coding: utf-8 +;; End: ------------------------------------------------------------ revno: 114640 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-10-12 17:28:30 -0700 message: ChangeLog fixes prompted by M-x authors diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-10-12 20:40:50 +0000 +++ lisp/ChangeLog 2013-10-13 00:28:30 +0000 @@ -3223,7 +3223,7 @@ 2013-07-23 Michael R. Mauger - * progmodes/sql.el Version 3.3 + * progmodes/sql.el: Version 3.3 (sql-product-alist): Improve oracle :prompt-cont-regexp. (sql-starts-with-prompt-re, sql-ends-with-prompt-re): New functions. (sql-interactive-remove-continuation-prompt): Rewrite, use @@ -8435,7 +8435,7 @@ 2013-03-14 Tassilo Horn - * doc-view.el Fix bug#13887. + * doc-view.el: Fix bug#13887. (doc-view-insert-image): Don't modify overlay associated to non-live windows, and implement horizontal centering of image in case it's smaller than the window. === modified file 'lisp/ChangeLog.16' --- lisp/ChangeLog.16 2013-09-17 07:31:09 +0000 +++ lisp/ChangeLog.16 2013-10-13 00:28:30 +0000 @@ -63,7 +63,7 @@ 2013-03-11 Michael R. Mauger - * progmodes/sql.el Version 3.2 + * progmodes/sql.el: Version 3.2 Please note that my address changed to ; the address remains active. (sql-connection-alist): Updates documentation to fix bug#13715. === modified file 'src/ChangeLog' --- src/ChangeLog 2013-10-12 08:48:31 +0000 +++ src/ChangeLog 2013-10-13 00:28:30 +0000 @@ -2365,7 +2365,7 @@ * keyboard.c (Fdiscard_input): Do not increment update_mode_lines. * nsfns.m (x_set_cursor_type): * w32fns.c (x_set_cursor_type): - * xfns.m (x_set_cursor_type): Do not set cursor_type_changed here... + * xfns.c (x_set_cursor_type): Do not set cursor_type_changed here... * xdisp.c (set_frame_cursor_types): ...but in common code. 2013-08-13 Dmitry Antipov === modified file 'test/ChangeLog' --- test/ChangeLog 2013-10-11 20:45:14 +0000 +++ test/ChangeLog 2013-10-13 00:28:30 +0000 @@ -149,7 +149,7 @@ 2013-08-28 Paul Eggert - * Makefile.in (SHELL): Now @SHELL@, not /bin/sh, + * automated/Makefile.in (SHELL): Now @SHELL@, not /bin/sh, for portability to hosts where /bin/sh has problems. 2013-08-21 David Engster @@ -555,7 +555,7 @@ 2012-12-14 Dmitry Gutov - * automated/ruby-mode-tests.el + * automated/ruby-mode-tests.el: Rename one interpolation test; add three more. (ruby-with-temp-buffer): New macro, use it where appropriate. (ruby-add-log-current-method-examples): Use "_" for target point. ------------------------------------------------------------ revno: 114639 committer: Stefan Monnier branch nick: trunk timestamp: Sat 2013-10-12 16:40:50 -0400 message: * lisp/progmodes/ruby-mode.el (ruby-smie-grammar): Add rule for paren-free method calls (bug#bug#15594). (ruby-smie--args-separator-p): New function. (ruby-smie--forward-token, ruby-smie--backward-token): Use it to recognize paren-free method calls. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-10-12 01:10:25 +0000 +++ lisp/ChangeLog 2013-10-12 20:40:50 +0000 @@ -1,5 +1,11 @@ 2013-10-12 Stefan Monnier + * progmodes/ruby-mode.el (ruby-smie-grammar): Add rule for paren-free + method calls (bug#bug#15594). + (ruby-smie--args-separator-p): New function. + (ruby-smie--forward-token, ruby-smie--backward-token): Use it to + recognize paren-free method calls. + * isearch.el (isearch-pre-command-hook): Don't build in knowledge about internals of universal-argument. === modified file 'lisp/progmodes/ruby-mode.el' --- lisp/progmodes/ruby-mode.el 2013-10-11 02:11:37 +0000 +++ lisp/progmodes/ruby-mode.el 2013-10-12 20:40:50 +0000 @@ -246,7 +246,8 @@ '((id) (insts (inst) (insts ";" insts)) (inst (exp) (inst "iuwu-mod" exp)) - (exp (exp1) (exp "," exp) (exp "=" exp) (exp "-" exp) (exp "+" exp)) + (exp (exp1) (exp "," exp) (exp "=" exp) (exp "-" exp) (exp "+" exp) + (id " @ " exp)) (exp1 (exp2) (exp2 "?" exp1 ":" exp1)) (exp2 ("def" insts "end") ("begin" insts-rescue-insts "end") @@ -274,7 +275,8 @@ (itheni (insts) (exp "then" insts)) (ielsei (itheni) (itheni "else" insts)) (if-body (ielsei) (if-body "elsif" if-body))) - '((nonassoc "in") (assoc ";") (assoc ",") (right "=") (assoc "-" "+")) + '((nonassoc "in") (assoc ";") (right " @ ") + (assoc ",") (right "=") (assoc "-" "+")) '((assoc "when")) '((assoc "elsif")) '((assoc "rescue" "ensure")) @@ -316,6 +318,12 @@ (or (eq ?\{ (char-before)) (looking-back "\\_ (save-excursion (forward-comment (point-max)) (point)) - (line-end-position)) - (ruby-smie--forward-token)) ;Fully redundant. - (t ";"))) - ((equal tok ".") (concat tok (ruby-smie--forward-id))) - (t tok))))))) + ((member tok '("unless" "if" "while" "until")) + (if (save-excursion (forward-word -1) (ruby-smie--bosp)) + tok "iuwu-mod")) + ((equal tok "|") + (if (ruby-smie--opening-pipe-p) "opening-|" tok)) + ((and (equal tok "") (looking-at "\\\\\n")) + (goto-char (match-end 0)) (ruby-smie--forward-token)) + ((equal tok "do") + (cond + ((not (ruby-smie--redundant-do-p 'skip)) tok) + ((> (save-excursion (forward-comment (point-max)) (point)) + (line-end-position)) + (ruby-smie--forward-token)) ;Fully redundant. + (t ";"))) + ((equal tok ".") (concat tok (ruby-smie--forward-id))) + (t tok))))))))) (defun ruby-smie--backward-id () (when (and (not (bobp)) @@ -372,6 +387,12 @@ ((and (> pos (line-end-position)) (ruby-smie--implicit-semi-p)) (skip-chars-forward " \t") ";") ((and (bolp) (not (bobp))) "") ;Presumably a heredoc. + ((and (> pos (point)) (not (bolp)) + (ruby-smie--args-separator-p pos)) + ;; We have "ID SPC ID", which is a method call, but it binds less tightly + ;; than commas, since a method call can also be "ID ARG1, ARG2, ARG3". + ;; In some textbooks, "e1 @ e2" is used to mean "call e1 with arg e2". + " @ ") (t (let ((tok (smie-default-backward-token))) (when (eq ?. (char-before)) === modified file 'test/indent/ruby.rb' --- test/indent/ruby.rb 2013-10-11 20:45:14 +0000 +++ test/indent/ruby.rb 2013-10-12 20:40:50 +0000 @@ -170,3 +170,7 @@ if foo && bar end + +method1 arg1, # bug#15594 + method2 arg2, + arg3 ------------------------------------------------------------ revno: 114638 committer: Paul Eggert branch nick: trunk timestamp: Sat 2013-10-12 13:00:38 -0700 message: Merge from gnulib. This incorporates: 2013-10-10 strtoumax: port to Solaris 8 2013-10-09 strtoimax, strtoumax: port to HP-UX 11.11 * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. * lib/inttypes.in.h, lib/strtoimax.c, m4/inttypes.m4, m4/strtoimax.m4: * m4/strtoumax.m4: Update from gnulib. diff: === modified file 'ChangeLog' --- ChangeLog 2013-10-11 18:29:18 +0000 +++ ChangeLog 2013-10-12 20:00:38 +0000 @@ -1,3 +1,13 @@ +2013-10-12 Paul Eggert + + Merge from gnulib, incorporating: + 2013-10-10 strtoumax: port to Solaris 8 + 2013-10-09 strtoimax, strtoumax: port to HP-UX 11.11 + * lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate. + * lib/inttypes.in.h, lib/strtoimax.c, m4/inttypes.m4, m4/strtoimax.m4: + * m4/strtoumax.m4: + Update from gnulib. + 2013-10-11 Stefan Monnier * configure.ac (LIBGNUTLS): Don't set LIBGNUTLS_* back to the empty === modified file 'lib/gnulib.mk' --- lib/gnulib.mk 2013-10-07 21:37:19 +0000 +++ lib/gnulib.mk 2013-10-12 20:00:38 +0000 @@ -565,6 +565,7 @@ -e 's/@''HAVE_DECL_STRTOIMAX''@/$(HAVE_DECL_STRTOIMAX)/g' \ -e 's/@''HAVE_DECL_STRTOUMAX''@/$(HAVE_DECL_STRTOUMAX)/g' \ -e 's/@''REPLACE_STRTOIMAX''@/$(REPLACE_STRTOIMAX)/g' \ + -e 's/@''REPLACE_STRTOUMAX''@/$(REPLACE_STRTOUMAX)/g' \ -e 's/@''INT32_MAX_LT_INTMAX_MAX''@/$(INT32_MAX_LT_INTMAX_MAX)/g' \ -e 's/@''INT64_MAX_EQ_LONG_MAX''@/$(INT64_MAX_EQ_LONG_MAX)/g' \ -e 's/@''UINT32_MAX_LT_UINTMAX_MAX''@/$(UINT32_MAX_LT_UINTMAX_MAX)/g' \ === modified file 'lib/inttypes.in.h' --- lib/inttypes.in.h 2013-01-01 09:11:05 +0000 +++ lib/inttypes.in.h 2013-10-12 20:00:38 +0000 @@ -1105,12 +1105,22 @@ #endif #if @GNULIB_STRTOUMAX@ -# if !@HAVE_DECL_STRTOUMAX@ -# undef strtoumax +# if @REPLACE_STRTOUMAX@ +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef strtoumax +# define strtoumax rpl_strtoumax +# endif +_GL_FUNCDECL_RPL (strtoumax, uintmax_t, + (const char *, char **, int) _GL_ARG_NONNULL ((1))); +_GL_CXXALIAS_RPL (strtoumax, uintmax_t, (const char *, char **, int)); +# else +# if !@HAVE_DECL_STRTOUMAX@ +# undef strtoumax _GL_FUNCDECL_SYS (strtoumax, uintmax_t, (const char *, char **, int) _GL_ARG_NONNULL ((1))); -# endif +# endif _GL_CXXALIAS_SYS (strtoumax, uintmax_t, (const char *, char **, int)); +# endif _GL_CXXALIASWARN (strtoumax); #elif defined GNULIB_POSIXCHECK # undef strtoumax === modified file 'lib/strtoimax.c' --- lib/strtoimax.c 2013-01-01 09:11:05 +0000 +++ lib/strtoimax.c 2013-10-12 20:00:38 +0000 @@ -48,28 +48,31 @@ #ifdef UNSIGNED # define Have_long_long HAVE_UNSIGNED_LONG_LONG_INT # define Int uintmax_t +# define Strtoimax strtoumax +# define Strtol strtoul +# define Strtoll strtoull # define Unsigned unsigned -# define strtoimax strtoumax -# define strtol strtoul -# define strtoll strtoull #else # define Have_long_long HAVE_LONG_LONG_INT # define Int intmax_t +# define Strtoimax strtoimax +# define Strtol strtol +# define Strtoll strtoll # define Unsigned #endif Int -strtoimax (char const *ptr, char **endptr, int base) +Strtoimax (char const *ptr, char **endptr, int base) { #if Have_long_long verify (sizeof (Int) == sizeof (Unsigned long int) || sizeof (Int) == sizeof (Unsigned long long int)); if (sizeof (Int) != sizeof (Unsigned long int)) - return strtoll (ptr, endptr, base); + return Strtoll (ptr, endptr, base); #else verify (sizeof (Int) == sizeof (Unsigned long int)); #endif - return strtol (ptr, endptr, base); + return Strtol (ptr, endptr, base); } === modified file 'm4/gnulib-comp.m4' --- m4/gnulib-comp.m4 2013-10-07 21:37:19 +0000 +++ m4/gnulib-comp.m4 2013-10-12 20:00:38 +0000 @@ -348,13 +348,13 @@ gl_FUNC_GNU_STRFTIME gl_HEADER_STRING_H gl_FUNC_STRTOIMAX - if test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then + if test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then AC_LIBOBJ([strtoimax]) gl_PREREQ_STRTOIMAX fi gl_INTTYPES_MODULE_INDICATOR([strtoimax]) gl_FUNC_STRTOUMAX - if test $ac_cv_func_strtoumax = no; then + if test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then AC_LIBOBJ([strtoumax]) gl_PREREQ_STRTOUMAX fi @@ -622,10 +622,10 @@ if test $HAVE_READLINKAT = 0; then func_gl_gnulib_m4code_03e0aaad4cb89ca757653bd367a6ccb7 fi - if { test $HAVE_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; } && test $ac_cv_type_long_long_int = yes; then + if { test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; } && test $ac_cv_type_long_long_int = yes; then func_gl_gnulib_m4code_strtoll fi - if test $ac_cv_func_strtoumax = no && test $ac_cv_type_unsigned_long_long_int = yes; then + if { test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; } && test $ac_cv_type_unsigned_long_long_int = yes; then func_gl_gnulib_m4code_strtoull fi m4_pattern_allow([^gl_GNULIB_ENABLED_]) === modified file 'm4/inttypes.m4' --- m4/inttypes.m4 2013-01-01 09:11:05 +0000 +++ m4/inttypes.m4 2013-10-12 20:00:38 +0000 @@ -148,6 +148,7 @@ HAVE_DECL_STRTOIMAX=1; AC_SUBST([HAVE_DECL_STRTOIMAX]) HAVE_DECL_STRTOUMAX=1; AC_SUBST([HAVE_DECL_STRTOUMAX]) REPLACE_STRTOIMAX=0; AC_SUBST([REPLACE_STRTOIMAX]) + REPLACE_STRTOUMAX=0; AC_SUBST([REPLACE_STRTOUMAX]) INT32_MAX_LT_INTMAX_MAX=1; AC_SUBST([INT32_MAX_LT_INTMAX_MAX]) INT64_MAX_EQ_LONG_MAX='defined _LP64'; AC_SUBST([INT64_MAX_EQ_LONG_MAX]) PRI_MACROS_BROKEN=0; AC_SUBST([PRI_MACROS_BROKEN]) === modified file 'm4/strtoimax.m4' --- m4/strtoimax.m4 2013-01-01 09:11:05 +0000 +++ m4/strtoimax.m4 2013-10-12 20:00:38 +0000 @@ -1,4 +1,4 @@ -# strtoimax.m4 serial 13 +# strtoimax.m4 serial 14 dnl Copyright (C) 2002-2004, 2006, 2009-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,7 @@ HAVE_DECL_STRTOIMAX=0 fi - if test $ac_cv_func_strtoimax = yes; then + if test "$ac_cv_func_strtoimax" = yes; then HAVE_STRTOIMAX=1 dnl On AIX 5.1, strtoimax() fails for values outside the 'int' range. AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles @@ -72,6 +72,10 @@ *no) REPLACE_STRTOIMAX=1 ;; esac else + if test "$ac_cv_have_decl_strtoimax" = yes; then + # HP-UX 11.11 has "#define strtoimax(...) ..." but no function. + REPLACE_STRTOIMAX=1 + fi HAVE_STRTOIMAX=0 fi ]) === modified file 'm4/strtoumax.m4' --- m4/strtoumax.m4 2013-01-01 09:11:05 +0000 +++ m4/strtoumax.m4 2013-10-12 20:00:38 +0000 @@ -1,4 +1,4 @@ -# strtoumax.m4 serial 11 +# strtoumax.m4 serial 12 dnl Copyright (C) 2002-2004, 2006, 2009-2013 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,7 +11,12 @@ dnl On OSF/1 5.1 with cc, this function is declared but not defined. AC_CHECK_FUNCS_ONCE([strtoumax]) AC_CHECK_DECLS_ONCE([strtoumax]) - if test "$ac_cv_have_decl_strtoumax" != yes; then + if test "$ac_cv_have_decl_strtoumax" = yes; then + if test "$ac_cv_func_strtoumax" != yes; then + # HP-UX 11.11 has "#define strtoimax(...) ..." but no function. + REPLACE_STRTOUMAX=1 + fi + else HAVE_DECL_STRTOUMAX=0 fi ]) ------------------------------------------------------------ revno: 114637 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2013-10-12 16:11:14 +0300 message: Make the MinGW32 build compatible with MinGW runtime 4.x. nt/inc/dirent.h (struct dirent) [__MINGW_MAJOR_VERSION >= 4]: Make the layout of 'struct dirent' be compatible with MinGW32 runtime versions 4.0 and later. nt/inc/ms-w32.h (__MINGW_MAJOR_VERSION, __MINGW_MINOR_VERSION) (__MINGW_PATCHLEVEL) [!__MINGW64_VERSION_MAJOR]: Define, if not defined, but not for MinGW64. (_USE_32BIT_TIME_T) [__MINGW64_VERSION_MAJOR]: Define, to force use of 32-bit time_t type. diff: === modified file 'nt/ChangeLog' --- nt/ChangeLog 2013-10-07 21:37:19 +0000 +++ nt/ChangeLog 2013-10-12 13:11:14 +0000 @@ -1,3 +1,15 @@ +2013-10-12 Eli Zaretskii + + * inc/dirent.h (struct dirent) [__MINGW_MAJOR_VERSION >= 4]: Make + the layout of 'struct dirent' be compatible with MinGW32 runtime + versions 4.0 and later. + + * inc/ms-w32.h (__MINGW_MAJOR_VERSION, __MINGW_MINOR_VERSION) + (__MINGW_PATCHLEVEL) [!__MINGW64_VERSION_MAJOR]: Define, if not + defined, but not for MinGW64. + (_USE_32BIT_TIME_T) [__MINGW64_VERSION_MAJOR]: Define, to force + use of 32-bit time_t type. + 2013-10-07 Paul Eggert Improve support for popcount and counting trailing zeros (Bug#15550). === modified file 'nt/inc/dirent.h' --- nt/inc/dirent.h 2013-01-28 14:41:08 +0000 +++ nt/inc/dirent.h 2013-10-12 13:11:14 +0000 @@ -19,6 +19,27 @@ long d_ino; /* inode number of entry */ unsigned short d_reclen; /* length of this record */ unsigned short d_namlen; /* length of string in d_name */ +#if __MINGW_MAJOR_VERSION >= 4 + /* MinGW.org runtime 4.x introduces a modified layout of + 'struct dirent', which makes it binary incompatible with + previous versions. To add insult to injury, the MinGW + startup code calls 'readdir', which is implemented in + w32.c. So we need to define the same layout of this struct + as the MinGW runtime does, or else command-line globbing + will be broken. (Versions of MinGW runtime after 4.0 are + supposed not to call 'readdir' from startup code, but we + had better be safe than sorry.) */ + unsigned d_type; /* File attributes */ + /* The next 3 fields are declared 'time_t' in the MinGW 4.0 + headers, but 'time_t' is by default a 64-bit type in 4.x, + and presumably the libmingwex library was compiled using + that default definition. So we must use 64-bit types here, + even though our time_t is a 32-bit type. What a mess! */ + __int64 d_time_create; + __int64 d_time_access; /* always midnight local time */ + __int64 d_time_write; + _fsize_t d_size; +#endif char d_name[MAXNAMLEN+1]; /* name of file */ }; === modified file 'nt/inc/ms-w32.h' --- nt/inc/ms-w32.h 2013-08-04 15:43:10 +0000 +++ nt/inc/ms-w32.h 2013-10-12 13:11:14 +0000 @@ -24,6 +24,32 @@ #define WINDOWSNT #endif +/* The @#$%^&! MinGW developers stopped updating the values of + __MINGW32_VERSION, __MINGW32_MAJOR_VERSION, and + __MINGW32_MINOR_VERSION values in v4.x of the runtime, to + "discourage its uses". So the values of those macros can no longer + be trusted, and we need the workaround below, to have a single set + of macros we can trust. (The .17 minor version is arbitrary.) */ +#ifdef __MINGW32__ +#include <_mingw.h> +#endif +/* MinGW64 doesn't have this problem, and does not define + __MINGW_VERSION. */ +#ifndef __MINGW64_VERSION_MAJOR +# ifndef __MINGW_VERSION +# define __MINGW_VERSION 3.17 +# undef __MINGW_MAJOR_VERSION +# define __MINGW_MAJOR_VERSION 3 +# undef __MINGW_MINOR_VERSION +# define __MINGW_MINOR_VERSION 17 +# undef __MINGW_PATCHLEVEL +# define __MINGW_PATCHLEVEL 0 +# endif +#endif +#if __MINGW_MAJOR_VERSION >= 4 +# define _USE_32BIT_TIME_T +#endif + /* #undef const */ /* Number of chars of output in the buffer of a stdio stream. */ ------------------------------------------------------------ revno: 114636 committer: Glenn Morris branch nick: trunk timestamp: Sat 2013-10-12 06:17:41 -0400 message: Auto-commit of generated files. diff: === modified file 'autogen/config.in' --- autogen/config.in 2013-10-09 10:17:52 +0000 +++ autogen/config.in 2013-10-12 10:17:41 +0000 @@ -576,6 +576,9 @@ /* Define if using GnuTLS. */ #undef HAVE_GNUTLS +/* Define if using GnuTLS v3. */ +#undef HAVE_GNUTLS3 + /* Define to 1 if you have the gpm library (-lgpm). */ #undef HAVE_GPM === modified file 'autogen/configure' --- autogen/configure 2013-10-10 10:17:41 +0000 +++ autogen/configure 2013-10-12 10:17:41 +0000 @@ -12253,11 +12253,69 @@ HAVE_GNUTLS=no +HAVE_GNUTLS3=no if test "${with_gnutls}" = "yes" ; then succeeded=no if test "$PKG_CONFIG" = "no" ; then + HAVE_GNUTLS3=no + else + PKG_CONFIG_MIN_VERSION=0.9.0 + if "$PKG_CONFIG" --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gnutls >= 3.0.0" >&5 +$as_echo_n "checking for gnutls >= 3.0.0... " >&6; } + + if "$PKG_CONFIG" --exists "gnutls >= 3.0.0" 2>&5 && + LIBGNUTLS_CFLAGS=`"$PKG_CONFIG" --cflags "gnutls >= 3.0.0" 2>&5` && + LIBGNUTLS_LIBS=`"$PKG_CONFIG" --libs "gnutls >= 3.0.0" 2>&5`; then + edit_cflags=" + s,///*,/,g + s/^/ / + s/ -I/ $isystem/g + s/^ // + " + LIBGNUTLS_CFLAGS=`$as_echo "$LIBGNUTLS_CFLAGS" | sed -e "$edit_cflags"` + LIBGNUTLS_LIBS=`$as_echo "$LIBGNUTLS_LIBS" | sed -e 's,///*,/,g'` + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes CFLAGS='$LIBGNUTLS_CFLAGS' LIBS='$LIBGNUTLS_LIBS'" >&5 +$as_echo "yes CFLAGS='$LIBGNUTLS_CFLAGS' LIBS='$LIBGNUTLS_LIBS'" >&6; } + succeeded=yes + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + LIBGNUTLS_CFLAGS="" + LIBGNUTLS_LIBS="" + ## If we have a custom action on failure, don't print errors, but + ## do set a variable so people can do so. Do it in a subshell + ## to capture any diagnostics in invoking pkg-config. + LIBGNUTLS_PKG_ERRORS=`("$PKG_CONFIG" --print-errors "gnutls >= 3.0.0") 2>&1` + + fi + + + + else + echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." + echo "*** See http://www.freedesktop.org/software/pkgconfig" + fi + fi + + if test $succeeded = yes; then + HAVE_GNUTLS3=yes + else + HAVE_GNUTLS3=no + fi + + if test "${HAVE_GNUTLS3}" = "yes"; then + +$as_echo "#define HAVE_GNUTLS3 1" >>confdefs.h + + HAVE_GNUTLS="yes" + else + + succeeded=no + + if test "$PKG_CONFIG" = "no" ; then HAVE_GNUTLS=no else PKG_CONFIG_MIN_VERSION=0.9.0 @@ -12305,6 +12363,7 @@ HAVE_GNUTLS=no fi + fi if test "${HAVE_GNUTLS}" = "yes"; then $as_echo "#define HAVE_GNUTLS 1" >>confdefs.h ------------------------------------------------------------ revno: 114635 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2013-10-12 12:00:21 +0300 message: Update nt/INSTALL with respect to giflib. diff: === modified file 'nt/INSTALL' --- nt/INSTALL 2013-08-31 18:26:59 +0000 +++ nt/INSTALL 2013-10-12 09:00:21 +0000 @@ -536,14 +536,6 @@ is in the PATH or otherwise accessible and that the binaries are compatible (for example, that they were built with the same compiler). - Binaries for the image libraries (among many others) can be found at - the GnuWin32 project. The PNG libraries are also included with GTK, - which is installed along with other Free Software that requires it. - Note specifically that, due to some packaging snafus in the - GnuWin32-supplied image libraries, you will need to download - _source_ packages for some of the libraries in order to get the - header files necessary for building Emacs with image support. - For PNG images, we recommend to use versions 1.4.x and later of libpng, because previous versions had security issues. You can find precompiled libraries and headers on the GTK download page for @@ -561,6 +553,27 @@ `dynamic-library-alist' and the value of `libpng-version', and download compatible DLLs if needed. + For GIF images, we recommend to use versions 5.0.0 or later of + giflib, as it is much enhanced wrt previous versions. You can find + precompiled binaries and headers for giflib on the ezwinports site, + http://sourceforge.net/projects/ezwinports/files/. + + Version 5.0.0 and later of giflib are binary incompatible with + previous versions (the signatures of several functions have + changed), so Emacs will only look for giflib libraries that are + compatible with the version it was compiled against. Similar to + libpng, that version is given by the value of the Lisp variable + `libgif-version'; e.g., 50005 means version 5.0.5. The variable + `dynamic-library-alist' is automatically set to name only those DLL + libraries that are known to be compatible with the version given by + `libgif-version'. + + Binaries for the other image libraries can be found at the GnuWin32 + project. Note specifically that, due to some packaging snafus in + the GnuWin32-supplied image libraries, you will need to download + _source_ packages for some of the libraries in order to get the + header files necessary for building Emacs with image support. + * Optional GnuTLS support To compile with GnuTLS, you will need pkg-config to be installed, as ------------------------------------------------------------ revno: 114634 committer: Eli Zaretskii branch nick: trunk timestamp: Sat 2013-10-12 11:48:31 +0300 message: Avoid compilation warnings in image.c. src/image.c (GIFLIB_MAJOR, GIFLIB_MINOR, GIFLIB_RELEASE): Move back after inclusion of gif_lib.h, thus fixing compiler warnings caused by revision 114614 (commit of 2013-10-10). diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2013-10-11 15:42:06 +0000 +++ src/ChangeLog 2013-10-12 08:48:31 +0000 @@ -1,3 +1,9 @@ +2013-10-12 Eli Zaretskii + + * image.c (GIFLIB_MAJOR, GIFLIB_MINOR, GIFLIB_RELEASE): Move back + after inclusion of gif_lib.h, thus fixing compiler warnings caused + by revision 114614 (commit of 2013-10-10). + 2013-10-11 Eli Zaretskii * xdisp.c (deep_copy_glyph_row): Handle the case that FROM and TO === modified file 'src/image.c' --- src/image.c 2013-10-11 06:32:29 +0000 +++ src/image.c 2013-10-12 08:48:31 +0000 @@ -7203,13 +7203,18 @@ #ifdef HAVE_GIF -/* Giflib before 5.0 didn't define these macros. */ -#ifndef GIFLIB_MAJOR -#define GIFLIB_MAJOR 4 -#endif - #if defined (HAVE_NTGUI) +/* winuser.h might define DrawText to DrawTextA or DrawTextW. + Undefine before redefining to avoid a preprocessor warning. */ +#ifdef DrawText +#undef DrawText +#endif +/* avoid conflict with QuickdrawText.h */ +#define DrawText gif_DrawText +#include +#undef DrawText + /* Giflib before 5.0 didn't define these macros (used only if HAVE_NTGUI). */ #ifndef GIFLIB_MINOR #define GIFLIB_MINOR 0 @@ -7218,22 +7223,17 @@ #define GIFLIB_RELEASE 0 #endif -/* winuser.h might define DrawText to DrawTextA or DrawTextW. - Undefine before redefining to avoid a preprocessor warning. */ -#ifdef DrawText -#undef DrawText -#endif -/* avoid conflict with QuickdrawText.h */ -#define DrawText gif_DrawText -#include -#undef DrawText - #else /* HAVE_NTGUI */ #include #endif /* HAVE_NTGUI */ +/* Giflib before 5.0 didn't define these macros. */ +#ifndef GIFLIB_MAJOR +#define GIFLIB_MAJOR 4 +#endif + #ifdef WINDOWSNT /* GIF library details. */ ------------------------------------------------------------ revno: 114633 committer: Stefan Monnier branch nick: trunk timestamp: Fri 2013-10-11 21:10:25 -0400 message: * lisp/isearch.el (isearch-pre-command-hook): Don't build in knowledge about internals of universal-argument. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2013-10-11 18:20:08 +0000 +++ lisp/ChangeLog 2013-10-12 01:10:25 +0000 @@ -1,3 +1,8 @@ +2013-10-12 Stefan Monnier + + * isearch.el (isearch-pre-command-hook): Don't build in knowledge about + internals of universal-argument. + 2013-10-11 Eli Zaretskii * menu-bar.el (tty-menu-navigation-map): Remap F10 to tty-menu-exit. === modified file 'lisp/isearch.el' --- lisp/isearch.el 2013-10-09 23:52:46 +0000 +++ lisp/isearch.el 2013-10-12 01:10:25 +0000 @@ -2233,6 +2233,9 @@ (let* ((key (this-single-command-keys)) (main-event (aref key 0))) (cond + ;; Don't exit Isearch if we're in the middle of some + ;; set-temporary-overlay-map thingy like universal-argument--mode. + ((not (eq overriding-terminal-local-map isearch-mode-map))) ;; Don't exit Isearch for isearch key bindings. ((commandp (lookup-key isearch-mode-map key nil))) ;; Optionally edit the search string instead of exiting. @@ -2241,8 +2244,6 @@ ;; Handle a scrolling function or prefix argument. ((or (and isearch-allow-prefix (memq this-command '(universal-argument - universal-argument-more - universal-argument-minus digit-argument negative-argument))) (and isearch-allow-scroll (or (eq (get this-command 'isearch-scroll) t) ------------------------------------------------------------ Use --include-merged or -n0 to see merged revisions.