Commit cf950e6b authored by Paul Eggert's avatar Paul Eggert
Browse files

Merge from trunk.

parents ca4aa935 27fa387a
2011-07-12 Paul Eggert <eggert@cs.ucla.edu>
2011-07-14 Paul Eggert <eggert@cs.ucla.edu>
Assume freestanding C89 headers, string.h, stdlib.h.
Again, this simplifies the code, and all current platforms have these.
......@@ -13,6 +13,10 @@
can add the gnulib modules for these (a 1-line change to Makefile.in).
* configure.in: Don't check for memcmp, memcpy, memmove, memset.
2011-07-13 Jan Djärv <jan.h.d@swipnet.se>
* configure.in (GSETTINGS): Check for gio-2.0 >= 2.26.
2011-07-11 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp>
* configure.in (LD_SWITCH_SYSTEM_TEMACS): Add -fno-pie on Darwin
......
;; mule-charsets.el -- Generate Mule-orignal charset maps.
;; mule-charsets.el -- Generate Mule-original charset maps.
;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
;; National Institute of Advanced Industrial Science and Technology (AIST)
;; Registration Number H13PRO009
......
......@@ -1986,7 +1986,7 @@ AC_SUBST(DBUS_OBJ)
dnl GSettings has been tested under GNU/Linux only.
HAVE_GSETTINGS=no
if test "${HAVE_X11}" = "yes" && test "${with_gsettings}" = "yes"; then
PKG_CHECK_MODULES(GSETTINGS, glib-2.0 >= 2.26, HAVE_GSETTINGS=yes, HAVE_GSETTINGS=no)
PKG_CHECK_MODULES(GSETTINGS, gio-2.0 >= 2.26, HAVE_GSETTINGS=yes, HAVE_GSETTINGS=no)
if test "$HAVE_GSETTINGS" = "yes"; then
AC_DEFINE(HAVE_GSETTINGS, 1, [Define to 1 if using GSettings.])
SETTINGS_CFLAGS="$GSETTINGS_CFLAGS"
......
2011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
* custom.texi (Hooks): Mention buffer-local hooks (bug#6218).
2011-07-13 Glenn Morris <rgm@gnu.org>
* dired.texi (Dired Enter): Mention --dired. (Bug#9039)
2011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
* mark.texi (Mark Ring): Clarify how many locations are saved
(bug#5770).
(Global Mark Ring): Ditto.
2011-07-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
* text.texi (Table Recognition): Use "at point" instead of "under
......
......@@ -820,6 +820,12 @@ the versions you added will remain in the hook variable together. You
can clear out individual functions by calling @code{remove-hook}, or
do @code{(setq @var{hook-variable} nil)} to remove everything.
@cindex buffer-local hooks
If the hook variable is buffer-local, the buffer-local variable will
be used instead of the global variable. However, if the buffer-local
variable contains the element @code{t}, the global hook variable will
be run as well.
@node Locals
@subsection Local Variables
......
......@@ -81,6 +81,13 @@ specified, the @code{ls} switches can include short options (that is,
single characters) requiring no arguments, and long options (starting
with @samp{--}) whose arguments are specified with @samp{=}.
@vindex dired-use-ls-dired
Note that Dired automatically adds the option @samp{--dired}, if
your @code{ls} program supports it, unless you explicitly set
the variable @code{dired-use-ls-dired} to @code{nil}. Without this
option, Dired will have trouble parsing some @samp{unusual} file-names.
See the documentation of @code{dired-use-ls-dired} for more details.
On MS-Windows and MS-DOS systems, Emacs @emph{emulates} @code{ls};
see @ref{ls in Lisp}, for options and peculiarities of that emulation.
......
......@@ -253,7 +253,9 @@ Another effect of this mode is that some keys, such as @key{DEL} and
@cindex mark ring
Aside from delimiting the region, the mark is also useful for
remembering spots that you may want to go back to. Each buffer
remembers 16 previous locations of the mark, in the @dfn{mark ring}.
remembers @code{mark-ring-max} previous locations of the mark, in the
@dfn{mark ring}. This defaults to 16 locations.
Commands that set the mark also push the old mark onto this ring.
@table @kbd
......@@ -315,10 +317,12 @@ Positions in Registers}).
@section The Global Mark Ring
@cindex global mark ring
@vindex global-mark-ring-max
In addition to the ordinary mark ring that belongs to each buffer,
Emacs has a single @dfn{global mark ring}. Each time you set a mark,
in any buffer, this is recorded in the global mark ring in addition to
the current buffer's own mark ring.
the current buffer's own mark ring. The length of this ring can be
controlled by @code{global-mark-ring-max}, and is 16 by default.
@kindex C-x C-@key{SPC}
@findex pop-global-mark
......
2011-07-14 Lars Magne Ingebrigtsen <larsi@gnus.org>
* help.texi (Documentation Basics): Add a link to the Function
Documentation node (bug#6580).
2011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
* keymaps.texi (Menu Bar): Mention :visible and :enable
(bug#6344). Text by Drew Adams.
* modes.texi (Running Hooks): Mention buffer-local hook variables
(bug#6218).
* objects.texi (General Escape Syntax): "a with grave accent" is
?xe0, not ?x8e0 (bug#5259).
2011-07-12 Chong Yidong <cyd@stupidchicken.com>
* display.texi (Face Attributes, Font Selection): Add references
......
......@@ -78,11 +78,12 @@ function or variable that it describes:
@item
@kindex function-documentation
The documentation for a function is usually stored in the function
definition itself (@pxref{Lambda Expressions}). The function
@code{documentation} knows how to extract it. You can also put
function documentation in the @code{function-documentation} property
of the function name. That is useful with definitions such as
keyboard macros that can't hold a documentation string.
definition itself (@pxref{Lambda Expressions} and @pxref{Function
Documentation}). The function @code{documentation} knows how to
extract it. You can also put function documentation in the
@code{function-documentation} property of the function name. That is
useful with definitions such as keyboard macros that can't hold a
documentation string.
@item
@kindex variable-documentation
......
......@@ -2262,6 +2262,17 @@ the double-dash and replacing each single dash with capitalization of
the following word. Thus, @code{"--:singleLine"}, is equivalent to
@code{"--single-line"}.
You can use a longer form to specify keywords such as @code{:enable}
and @code{:visible} for a menu separator:
@code{(menu-item @var{separator-type} nil . @var{item-property-list})}
For example:
@example
(menu-item "--" nil :visible (boundp 'foo))
@end example
Some systems and display toolkits don't really handle all of these
separator types. If you use a type that isn't supported, the menu
displays a similar kind of separator that is supported.
......
......@@ -101,6 +101,11 @@ one, with no arguments.
The hook variable's value can also be a single function---either a
lambda expression or a symbol with a function definition---which
@code{run-hooks} calls. But this usage is obsolete.
If the hook variable is buffer-local, the buffer-local variable will
be used instead of the global variable. However, if the buffer-local
variable contains the element @code{t}, the global hook variable will
be run as well.
@end defun
@defun run-hook-with-args hook &rest args
......@@ -169,11 +174,11 @@ function goes at the end of the hook list and will be executed last.
value is a single function; it sets or changes the value to a list of
functions.
If @var{local} is non-@code{nil}, that says to add @var{function} to
the buffer-local hook list instead of to the global hook list. If
needed, this makes the hook buffer-local and adds @code{t} to the
buffer-local value. The latter acts as a flag to run the hook
functions in the default value as well as in the local value.
If @var{local} is non-@code{nil}, that says to add @var{function} to the
buffer-local hook list instead of to the global hook list. This makes
the hook buffer-local and adds @code{t} to the buffer-local value. The
latter acts as a flag to run the hook functions in the default value as
well as in the local value.
@end defun
@defun remove-hook hook function &optional local
......
......@@ -392,7 +392,7 @@ value is more important than the @acronym{ASCII} representation.
and the hexadecimal character code. You can use any number of hex
digits, so you can represent any character code in this way.
Thus, @samp{?\x41} for the character @kbd{A}, @samp{?\x1} for the
character @kbd{C-a}, and @code{?\x8e0} for the Latin-1 character
character @kbd{C-a}, and @code{?\xe0} for the Latin-1 character
@iftex
@samp{@`a}.
@end iftex
......@@ -1037,7 +1037,7 @@ digits as necessary. (Multibyte non-@acronym{ASCII} character codes are all
greater than 256.) Any character which is not a valid hex digit
terminates this construct. If the next character in the string could be
interpreted as a hex digit, write @w{@samp{\ }} (backslash and space) to
terminate the hex escape---for example, @w{@samp{\x8e0\ }} represents
terminate the hex escape---for example, @w{@samp{\xe0\ }} represents
one character, @samp{a} with grave accent. @w{@samp{\ }} in a string
constant is just like backslash-newline; it does not contribute any
character to the string, but it does terminate the preceding hex escape.
......
2010-07-10 Kevin Ryde <user42@zip.com.au>
* cl.texi (For Clauses): Add destructuring example processing an
alist (bug#6596).
2011-07-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
* org.texi (Special agenda views): Fix double quoting (bug#3509).
......
......@@ -2586,7 +2586,14 @@ the trailing values are ignored, and if there are more variables
than values the trailing variables get the value @code{nil}.
If @code{nil} is used as a variable name, the corresponding
values are ignored. Destructuring may be nested, and dotted
lists of variables like @code{(x . y)} are allowed.
lists of variables like @code{(x . y)} are allowed, so for example
to process an alist
@example
(loop for (key . value) in '((a . 1) (b . 2))
collect value)
@result{} (1 2)
@end example
@node Iteration Clauses, Accumulation Clauses, For Clauses, Loop Facility
@subsection Iteration Clauses
......
......@@ -986,6 +986,15 @@ sc.el, x-menu.el, rnews.el, rnewspost.el
* Lisp changes in Emacs 24.1
** Window changes
*** `switch-to-buffer' has a new optional argument FORCE-SAME-WINDOW,
which if non-nil requires the buffer to be displayed in the currently
selected window, signaling an error otherwise. If nil, another window
can be used, e.g. if the selected one is strongly dedicated.
*** FIXME: buffer-display-alist changes
** Completion
*** New variable completion-extra-properties used to specify extra properties
of the current completion:
......
2011-07-14 Chong Yidong <cyd@stupidchicken.com>
* bindings.el: Add advertised binding for set-mark-command
(Bug#5772).
2011-07-14 Chong Yidong <cyd@stupidchicken.com>
* bindings.el (mode-line-other-buffer):
* bookmark.el (bookmark-bmenu-2-window):
* bs.el (bs-cycle-next, bs-cycle-previous):
* net/tramp-cmds.el (tramp-append-tramp-buffers): Revert to using
switch-to-buffer.
* net/tramp-compat.el (tramp-compat-pop-to-buffer-same-window):
Deleted.
2011-07-14 Juanma Barranquero <lekktu@gmail.com>
* follow.el (follow-debug-message, follow-redisplay):
* jka-cmpr-hook.el (with-auto-compression-mode):
Fix typos in docstrings.
2011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
* subr.el (with-silent-modifications): Clarify somewhat what the
macro inhibits (bug#6525).
* simple.el (eval-expression): Note what it does if called
interactively (bug#6495).
2011-07-13 Chong Yidong <cyd@stupidchicken.com>
* window.el (switch-to-buffer): New arg FORCE-SAME-WINDOW. Use
pop-to-buffer buffer-or-name if it is nil.
* emacs-lisp/bytecomp.el (byte-compile-interactive-only-functions):
Remove switch-to-buffer.
2011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
* files.el (make-directory): Clarify that an error will be raised
if there's an error (bug#6397).
* startup.el (initial-buffer-choice): Add `none' as a choice
(bug#6234).
* subr.el (add-hook): Clarify section about buffer-local hooks
(bug#6218).
* dired.el (dired-flagged): Clarify doc string (bug#6117).
2011-07-13 Juanma Barranquero <lekktu@gmail.com>
* tabify.el (untabify): Preserve the current column so that point
doesn't move (bug#6032).
2011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
* progmodes/cperl-mode.el (cperl-syntaxify-by-font-lock): Rewrite
to avoid awkward possessive "s" (bug#5986).
2011-07-13 Glenn Morris <rgm@gnu.org>
* dired.el (dired-use-ls-dired): Doc fix. (Bug#9039).
(dired-insert-directory): Give a message the first time
if ls is found not to support --dired.
2011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
* simple.el (toggle-truncate-lines): Clarify what is toggled
(bug#5580). Text by Drew Adams.
2011-07-13 Chong Yidong <cyd@stupidchicken.com>
* simple.el (blink-matching-open): Make the error message from the
last change less verbose.
2011-07-13 Dan Nicolaescu <dann@ics.uci.edu>
* font-lock.el (font-lock-comment-face): Use the high contrast
"yellow" color for font-lock-comment-face on low color terminals
using a dark background color (bug#4221).
2011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
* dired.el (dired-insert-set-properties): Make the doc string
reflect what it does now (bug#5325).
* simple.el (blink-matching-open): Say that we were unable to find
the match within the limit, if we're limited (bug#5122).
* international/mule-cmds.el (prefer-coding-system): Add an
example (bug#4869).
* progmodes/etags.el (tags-search): Document `file-list-form'
(bug#4731).
2011-07-13 Lawrence Mitchell <wence@gmx.li>
* net/browse-url.el (browse-url-default-browser)
(browse-url-browser-function): Make the default browser choice a
bit more logical (bug#4300). Also clean up the doc string.
2011-07-13 Juanma Barranquero <lekktu@gmail.com>
* bindings.el (completion-ignored-extensions): Add OpenMCL/Clozure
binary endings (bug#4440).
2011-07-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
* info.el (info-insert-file-contents): Inhibit jka-compr messages,
which can be pretty annoying (bug#8971).
* jka-compr.el (jka-compr-verbose): New variable, and use
throughout (bug#8971).
* info.el (Info-find-file): Fall back on the installation
directory if we can't find the info node anywhere else.
2011-07-13 Sergei Organov <osv@javad.com> (tiny change)
* vc/vc.el (vc-revert-file):
Don't set file time-stamp in the past. (Bug#5181)
2011-07-12 Lars Magne Ingebrigtsen <larsi@gnus.org>
* files.el (after-find-file): Give a better error message when
......
......@@ -6892,7 +6892,7 @@
(find-file-noselect): Use it if new optional argument `rawfile' is
non-nil.
* startup.el (command-line-1): Add option --eval to evalute an
* startup.el (command-line-1): Add option --eval to evaluate an
expression on the command line and print the result.
1995-08-14 Richard Stallman <rms@mole.gnu.ai.mit.edu>
......
......@@ -471,8 +471,7 @@ Like `bury-buffer', but temporarily select EVENT's window."
(defun mode-line-other-buffer () "\
Switch to the most recently selected buffer other than the current one."
(interactive)
(with-no-warnings ; We really do want to call `switch-to-buffer' here.
(switch-to-buffer (other-buffer))))
(switch-to-buffer (other-buffer) nil t))
(defun mode-line-next-buffer (event)
"Like `next-buffer', but temporarily select EVENT's window."
......@@ -594,9 +593,12 @@ is okay. See `mode-line-format'.")
".fas" ".lib" ".mem"
;; CMUCL
".x86f" ".sparcf"
;; Other CL implementations (Allegro, LispWorks, OpenMCL)
".fasl" ".ufsl" ".fsl" ".dxl" ".pfsl" ".dfsl"
".p64fsl" ".d64fsl" ".dx64fsl"
;; OpenMCL / Clozure CL
".dfsl" ".pfsl" ".d64fsl" ".p64fsl" ".lx64fsl" ".lx32fsl"
".dx64fsl" ".dx32fsl" ".fx64fsl" ".fx32fsl" ".sx64fsl"
".sx32fsl" ".wx64fsl" ".wx32fsl"
;; Other CL implementations (Allegro, LispWorks)
".fasl" ".ufsl" ".fsl" ".dxl"
;; Libtool
".lo" ".la"
;; Gettext
......@@ -847,6 +849,8 @@ if `inhibit-field-text-motion' is non-nil."
(define-key global-map "\C-@" 'set-mark-command)
;; Many people are used to typing C-SPC and getting C-@.
(define-key global-map [?\C- ] 'set-mark-command)
(put 'set-mark-command :advertised-binding [?\C- ])
(define-key ctl-x-map "\C-x" 'exchange-point-and-mark)
(define-key ctl-x-map "\C-@" 'pop-global-mark)
(define-key ctl-x-map [?\C- ] 'pop-global-mark)
......
......@@ -1841,8 +1841,7 @@ With a prefix arg, prompts for a file to save them in."
(menu (current-buffer))
(pop-up-windows t))
(delete-other-windows)
(with-no-warnings ; We really do want to call `switch-to-buffer' here.
(switch-to-buffer (other-buffer)))
(switch-to-buffer (other-buffer) nil t)
(bookmark--jump-via bmrk 'pop-to-buffer)
(bury-buffer menu)))
......
......@@ -1215,8 +1215,7 @@ by buffer configuration `bs-cycle-configuration-name'."
;; We don't want the frame iconified if the only window in the frame
;; happens to be dedicated.
(bury-buffer (current-buffer))
(with-no-warnings ; We really do want to call `switch-to-buffer' here.
(switch-to-buffer next))
(switch-to-buffer next nil t)
(setq bs--cycle-list (append (cdr cycle-list)
(list (car cycle-list))))
(bs-message-without-log "Next buffers: %s"
......@@ -1245,8 +1244,7 @@ by buffer configuration `bs-cycle-configuration-name'."
bs--cycle-list)))
(prev-buffer (car tupel))
(cycle-list (cdr tupel)))
(with-no-warnings ; We really do want to call `switch-to-buffer' here.
(switch-to-buffer prev-buffer))
(switch-to-buffer prev-buffer nil t)
(setq bs--cycle-list (append (last cycle-list)
(reverse (cdr (reverse cycle-list)))))
(bs-message-without-log "Previous buffers: %s"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment