Commit 70c8ae6e authored by Kenichi Handa's avatar Kenichi Handa

merge trunk

parents 85b64f02 fc7f501b
2013-10-12 Paul Eggert <eggert@cs.ucla.edu>
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 <monnier@iro.umontreal.ca>
* configure.ac (LIBGNUTLS): Don't set LIBGNUTLS_* back to the empty
string when gnutls2 is installed but gnutls3 is not.
2013-10-11 Teodor Zlatanov <tzz@lifelogs.com>
* configure.ac: Define HAVE_GNUTLS3 if GnuTLS v3 is found.
2013-10-10 Barry Fishman <barry_fishman@acm.org> (tiny change)
* configure.ac: Update for giflib 5. (Bug#15531)
......
......@@ -576,6 +576,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
/* 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
......
......@@ -12253,10 +12253,68 @@ fi
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
......@@ -12305,6 +12363,7 @@ $as_echo "no" >&6; }
HAVE_GNUTLS=no
fi
fi
if test "${HAVE_GNUTLS}" = "yes"; then
$as_echo "#define HAVE_GNUTLS 1" >>confdefs.h
......
......@@ -2422,8 +2422,15 @@ fi
AC_SUBST(LIBSELINUX_LIBS)
HAVE_GNUTLS=no
HAVE_GNUTLS3=no
if test "${with_gnutls}" = "yes" ; then
PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.6], HAVE_GNUTLS=yes, HAVE_GNUTLS=no)
PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 3.0.0], HAVE_GNUTLS3=yes, HAVE_GNUTLS3=no)
if test "${HAVE_GNUTLS3}" = "yes"; then
AC_DEFINE(HAVE_GNUTLS3, 1, [Define if using GnuTLS v3.])
HAVE_GNUTLS="yes"
else
PKG_CHECK_MODULES([LIBGNUTLS], [gnutls >= 2.6.6], HAVE_GNUTLS=yes, HAVE_GNUTLS=no)
fi
if test "${HAVE_GNUTLS}" = "yes"; then
AC_DEFINE(HAVE_GNUTLS, 1, [Define if using GnuTLS.])
fi
......
2013-10-13 Glenn Morris <rgm@gnu.org>
* display.texi (Text Scale): Update text-scale-adjust details.
* ack.texi (Acknowledgments):
* emacs.texi (Acknowledgments): Use accented form of some names.
2013-10-08 Eli Zaretskii <eliz@gnu.org>
* ack.texi (Acknowledgments): Fix spelling of Hrvoje Nikšić's
......
......@@ -104,7 +104,7 @@ footnotes in email messages; and @file{gnus-audio.el} and
@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 @@ over maintainership. Benjamin Andresen, Thomas Baumann, Joel Boehland, Jan Böc
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 @@ used in mail messages and news articles; and @file{terminal.el}, a
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 @@ minor mode for displaying a ruler in the header line; and
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 @@ Ronald S. Schnell wrote @file{dunnet.el}, a text adventure game.
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
......
......@@ -743,9 +743,9 @@ determine which action to take.
@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
......
......@@ -1416,18 +1416,18 @@ Christopher J. Madsen, Neil M. Mager, Ken Manheimer, Bill Mann,
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 @@ Roberts, Roland B. Roberts, John Robinson, Denis B. Roegel, Danny
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 @@ Wohler, Steven A. Wood, Dale R. Worley, Francis J. Wright, Felix
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
......
2013-10-13 Glenn Morris <rgm@gnu.org>
* intro.texi (Acknowledgments): Use accented form of some names.
2013-10-09 Glenn Morris <rgm@gnu.org>
* control.texi (Conditionals): Copyedits. (Bug#15558)
......
......@@ -545,7 +545,7 @@ Eirik Fuller, Stephen Gildea, Bob Glickstein, Eric Hanchrow, Jesper
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,
......
......@@ -22998,7 +22998,7 @@ elements on the line is (i.e., the non-info part). If you put
additional elements on the mode line (e.g., a clock), you should modify
this variable:
@c Hook written by Francesco Potorti` <pot@cnuce.cnr.it>
@c Hook written by Francesco Potortì <pot@cnuce.cnr.it>
@lisp
(add-hook 'display-time-hook
(lambda () (setq gnus-mode-non-string-length
......@@ -565,6 +565,7 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(WARN_ON_U
-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' \
......
......@@ -1105,12 +1105,22 @@ _GL_WARN_ON_USE (strtoimax, "strtoimax is unportable - "
#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
......
......@@ -48,28 +48,31 @@ long long int strtoll (char const *, char **, int);
#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);
}
......@@ -4,6 +4,42 @@
superfluous condition in chekcing whether a coding system is safe
or not.
2013-10-13 Oleh Krehel <ohwoeowho@gmail.com>
* replace.el (how-many): Fix rstart and !rend case. (Bug#15589)
2013-10-13 Andreas Politz <politza@hochschule-trier.de>
* progmodes/sql.el (sql-add-product): Fix paren typo. (Bug#15435)
2013-10-13 Glenn Morris <rgm@gnu.org>
* 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):
Add some entries.
(authors-fixed-entries): Use accented form of name.
2013-10-12 Stefan Monnier <monnier@iro.umontreal.ca>
* 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.
2013-10-11 Eli Zaretskii <eliz@gnu.org>
* menu-bar.el (tty-menu-navigation-map): Remap F10 to tty-menu-exit.
Bind all menu-bar sequences to tty-menu-exit -- this pops down a
dropped menu on second mouse click on the menu bar.
2013-10-11 Stefan Monnier <monnier@iro.umontreal.ca>
* progmodes/sh-script.el: Provide simpl(e|istic) completion.
......@@ -3212,7 +3248,7 @@
2013-07-23 Michael R. Mauger <michael@mauger.com>
* 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
......@@ -8424,7 +8460,7 @@
2013-03-14 Tassilo Horn <tsdh@gnu.org>
* 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.
......
......@@ -63,7 +63,7 @@
2013-03-11 Michael R. Mauger <michael@mauger.com>
* progmodes/sql.el Version 3.2
* progmodes/sql.el: Version 3.2
Please note that my address changed to <michael@mauger.com>;
the <mmaug@yahoo.com> address remains active.
(sql-connection-alist): Updates documentation to fix bug#13715.
......
......@@ -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 @@ If there are no buffers left to create, kill the timer."
(provide 'desktop)
;;; desktop.el ends here
;; Local Variables:
;; coding: utf-8
;; End:
......@@ -103,6 +103,7 @@ files.")
("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 @@ files.")
("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 @@ Changes to files matching one of the regexps in this list are not listed.")
"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 @@ Changes to files matching one of the regexps in this list are not listed.")
"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 @@ Changes to files in this list are not listed.")
("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.
......
......@@ -45,7 +45,7 @@
;;
;; emacs -batch -f list-load-path-shadows
;;
;; Thanks to Francesco Potorti` <pot@cnuce.cnr.it> for suggestions,
;; Thanks to Francesco Potortì <pot@cnuce.cnr.it> for suggestions,
;; rewritings & speedups.
;;; Code:
......@@ -284,3 +284,7 @@ version unless you know what you are doing.\n")
(provide 'shadow)
;;; shadow.el ends here
;; Local Variables:
;; coding: utf-8
;; End:
......@@ -299,11 +299,9 @@ key-binding used to invoke the command, with all modifiers removed:
- 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
......
......@@ -1138,7 +1138,7 @@
2013-02-25 Adam Sjøgren <asjo@koldfront.dk>
* 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 <deng@randomsample.de>
......
......@@ -2233,6 +2233,9 @@ before the command is executed globally with terminated Isearch."
(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 @@ before the command is executed globally with terminated Isearch."
;; 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)
......
......@@ -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ì
;; <F.Potorti@cnuce.cnr.it> pointed out that my use of defvar was
;; weird, suggested fix, and added let form.
......@@ -375,3 +375,7 @@ You might need to set `uce-mail-reader' before using this."
(provide 'uce)
;;; uce.el ends here
;; Local Variables:
;; coding: utf-8
;; End:
......@@ -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` <pot@cnuce.cnr.it> cleaned it up thoroughly,
;; Francesco Potortì <pot@cnuce.cnr.it> cleaned it up thoroughly,
;; making it faster, more robust and more tolerant of different
;; systems' man idiosyncrasies.
......
......@@ -2046,7 +2046,7 @@ It must accept a buffer as its only required argument.")
;; 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)
......@@ -2261,6 +2261,50 @@ If nil, the current mouse position is used."
(popup-menu-normalize-position (event-end position)))
(t position)))
(defcustom tty-menu-open-use-tmm nil
"If non-nil, \\[menu-bar-open] on a TTY will invoke `tmm-menubar'.
If nil, \\[menu-bar-open] will drop down the menu corresponding to the
first (leftmost) menu-bar item; you can select other items by typing
\\[forward-char], \\[backward-char], \\[right-char] and \\[left-char]."
:type '(choice (const :tag "F10 drops down TTY menus" nil)
(const :tag "F10 invokes tmm-menubar" t))
:group 'display
:version "24.4")
(defvar tty-menu--initial-menu-x 1
"X coordinate of the first menu-bar menu dropped by F10.
This is meant to be used only for debugging TTY menus.")
(defun menu-bar-open (&optional frame)
"Start key navigation of the menu bar in FRAME.
This function decides which method to use to access the menu
depending on FRAME's terminal device. On X displays, it calls
`x-menu-bar-open'; on Windows, `w32-menu-bar-open'; otherwise it
calls either `popup-menu' or `tmm-menubar' depending on whether
\`tty-menu-open-use-tmm' is nil or not.
If FRAME is nil or not given, use the selected frame."
(interactive)
(let ((type (framep (or frame (selected-frame)))))
(cond
((eq type 'x) (x-menu-bar-open frame))
((eq type 'w32) (w32-menu-bar-open frame))
((and (null tty-menu-open-use-tmm)
(not (zerop (or (frame-parameter nil 'menu-bar-lines) 0))))
(let* ((x tty-menu--initial-menu-x)
(menu (menu-bar-menu-at-x-y x 0 frame)))
(popup-menu (or
(lookup-key global-map (vector 'menu-bar menu))
(lookup-key (current-local-map) (vector 'menu-bar menu)))
(posn-at-x-y x 0 nil t) nil t)))
(t (with-selected-frame (or frame (selected-frame))
(tmm-menubar))))))
(global-set-key [f10] 'menu-bar-open)