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

Merge from mainline.

parents 792c7b2b d806ab68
2011-03-28 Glenn Morris <>
* autogen/update_autogen: Pass -f to autoreconf.
* (get_version): Discard "not found" lines.
(check_version): Respect $AUTOCONF etc environment variables.
2011-03-27 Glenn Morris <>
* (AC_TYPE_SIGNAL): Remove obsolete macro.
......@@ -17,7 +17,7 @@ The `' script can help you figure out if you have the
necessary tools.
The first time you build, there are a couple of extra steps.
First, generate the `configure' script:
First, generate the `configure' script and some related files:
$ ./
......@@ -30,6 +30,7 @@
### Code:
## Tools we need:
## Note that we respect the values of AUTOCONF etc, like autoreconf does.
progs="autoconf automake"
## Minimum versions we need:
......@@ -46,7 +47,8 @@ automake_min=1.11
## Also note that we do not handle micro versions.
get_version ()
$1 --version 2>&1 | sed -n '1 s/.* \([1-9][0-9\.]*\).*/\1/p'
## Remove eg "./ line 50: autoconf: command not found".
$1 --version 2>&1 | sed -e '/not found/d' -n -e '1 s/.* \([1-9][0-9\.]*\).*/\1/p'
## $1 = version string, eg "2.59"
......@@ -71,7 +73,14 @@ minor_version ()
## Return 3 for unexpected error (eg failed to parse version).
check_version ()
have_version=`get_version $1`
## Respect eg $AUTOMAKE if it is set, like autoreconf does.
uprog=`echo $1 | sed 'y/abcdefghijklmnopqrstuvwxyz/ABCDEFGHIJKLMNOPQRSTUVWXYZ/'`
eval uprog=\$${uprog}
[ x"$uprog" = x ] && uprog=$1
have_version=`get_version $uprog`
[ x"$have_version" = x ] && return 1
......@@ -999,9 +999,6 @@ along with GNU Emacs. If not, see <>. */
slash */
/* Define as the return type of signal handlers (`int' or `void'). */
/* Define to l, ll, u, ul, ull, etc., as suitable for constants of type
'sig_atomic_t'. */
......@@ -1274,11 +1271,6 @@ along with GNU Emacs. If not, see <>. */
/* SIGTYPE is the macro we actually use. */
#ifndef SIGTYPE
#ifdef emacs /* Don't do this for lib-src. */
/* Tell regex.c to use a type compatible with Emacs. */
#define RE_TRANSLATE_TYPE Lisp_Object
......@@ -7899,40 +7899,6 @@ $as_echo "#define HAVE_STRUCT_UTIMBUF 1" >>confdefs.h
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking return type of signal handlers" >&5
$as_echo_n "checking return type of signal handlers... " >&6; }
if test "${ac_cv_type_signal+set}" = set; then :
$as_echo_n "(cached) " >&6
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
/* end confdefs.h. */
#include <sys/types.h>
#include <signal.h>
main ()
return *(signal (0, 0)) (0) == 1;
return 0;
if ac_fn_c_try_compile "$LINENO"; then :
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_type_signal" >&5
$as_echo "$ac_cv_type_signal" >&6; }
cat >>confdefs.h <<_ACEOF
#define RETSIGTYPE $ac_cv_type_signal
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for speed_t" >&5
$as_echo_n "checking for speed_t... " >&6; }
if test "${emacs_cv_speed_t+set}" = set; then :
......@@ -126,7 +126,7 @@ done < $tempfile
echo "Running autoreconf..."
autoreconf -i -I m4 2>| $tempfile
autoreconf -f -i -I m4 2>| $tempfile
2011-03-28 Stefan Monnier <>
* commands.texi (Command Overview): post-command-hook is not reset to
nil any more.
2011-03-19 Stefan Monnier <>
* strings.texi (String Conversion): Don't mention
......@@ -91,8 +91,9 @@ and also when the command loop is first entered. At that time,
Quitting is suppressed while running @code{pre-command-hook} and
@code{post-command-hook}. If an error happens while executing one of
these hooks, it terminates execution of the hook, and clears the hook
variable to @code{nil} so as to prevent an infinite loop of errors.
these hooks, it does not terminate execution of the hook; instead
the error is silenced and the function in which the error occurred
is removed from the hook.
A request coming into the Emacs server (@pxref{Emacs Server,,,
emacs, The GNU Emacs Manual}) runs these two hooks just as a keyboard
......@@ -162,6 +162,9 @@ cannot be encoded by the `terminal-coding-system'.
** On graphical displays, the mode-line no longer ends in dashes.
** On Nextstep/OSX, the menu bar can be hidden by customizing
** Basic SELinux support has been added.
This requires Emacs to be linked with libselinux at build time.
......@@ -745,6 +748,11 @@ sc.el, x-menu.el, rnews.el, rnewspost.el
* Lisp changes in Emacs 24.1
** pre/post-command-hook are not reset to nil upon error.
Instead, the offending function is removed.
** New low-level function run-hook-wrapped.
** byte-compile-disable-print-circle is obsolete.
** deferred-action-list and deferred-action-function are obsolete.
** Removed the stack-trace-on-error variable.
2011-03-29 Ken Manheimer <>
* allout.el (allout-hide-by-annotation, allout-flag-region):
Reduce possibility of overlay leakage by making them volatile.
* allout-widgets.el (allout-widgets-tally): Define as nil so the
hash is not shared between buffers. Mode initialization is
responsible for giving it a useful starting value.
(allout-item-span): Reduce possibility of overlay leakage by
making them volatile.
(allout-widgets-count-buttons-in-region): Add diagnostic function
for tracking down button overlay leaks.
2011-03-29 Leo Liu <>
* ido.el (ido-read-internal): Use the default history var
minibuffer-history if no HISTORY is specified.
2011-03-28 Brian T. Sniffen <> (tiny change)
* net/imap.el (imap-shell-open, imap-process-connection-type): Use
imap-process-connection-type for 'shell' streams as well as
Kerberos, SSL, other subprocesses.
2011-03-28 Leo Liu <>
* abbrev.el (abbrev-table-empty-p): New function.
(prepare-abbrev-list-buffer): Place empty abbrev tables after
nonempty ones. (Bug#5937)
2011-03-27 Jan Djärv <>
* cus-start.el (all): Add boolean ns-auto-hide-menu-bar.
2011-03-27 Leo Liu <>
* ansi-color.el (ansi-color-names-vector): Allow cons cell value
......@@ -123,8 +123,13 @@ Otherwise display all abbrevs."
(if local
(abbrev-table-name local-table) t)
(dolist (table abbrev-table-name-list)
(insert-abbrev-table-description table t)))
(let (empty-tables)
(dolist (table abbrev-table-name-list)
(if (abbrev-table-empty-p (symbol-value table))
(push table empty-tables)
(insert-abbrev-table-description table t)))
(dolist (table (nreverse empty-tables))
(insert-abbrev-table-description table t))))
(goto-char (point-min))
(set-buffer-modified-p nil)
......@@ -420,6 +425,19 @@ PROPS is a list of properties."
(and (vectorp object)
(numberp (abbrev-table-get object :abbrev-table-modiff))))
(defun abbrev-table-empty-p (object &optional ignore-system)
"Return nil if there are no abbrev symbols in OBJECT.
If IGNORE-SYSTEM is non-nil, system definitions are ignored."
(unless (abbrev-table-p object)
(error "Non abbrev table object"))
(not (catch 'some
(mapatoms (lambda (abbrev)
(unless (or (zerop (length (symbol-name abbrev)))
(and ignore-system
(abbrev-get abbrev :system)))
(throw 'some t)))
(defvar global-abbrev-table (make-abbrev-table)
"The abbrev table whose abbrevs affect all buffers.
Each buffer may also have a local abbrev table.
......@@ -238,7 +238,7 @@ buffer, and tracking increases as new widgets are added and
decreases as obsolete widgets are garbage collected."
:type 'boolean
:group 'allout-widgets-developer)
(defvar allout-widgets-tally (make-hash-table :test 'eq :weakness 'key)
(defvar allout-widgets-tally nil
"Hash-table of existing allout widgets, for debugging.
Table is maintained iff `allout-widgets-maintain-tally' is non-nil.
......@@ -2100,6 +2100,7 @@ previously established or is not moved."
(cond ((not overlay) (when start
(setq overlay (make-overlay start end nil t nil))
(overlay-put overlay 'button item-widget)
(overlay-put overlay 'evaporate t)
(widget-put item-widget :span-overlay overlay)
;; report:
......@@ -2343,6 +2344,19 @@ The elements of LIST are not copied, just the list structure itself."
(while (consp list) (push (pop list) res))
(prog1 (nreverse res) (setcdr res list)))
(car list)))
;;;_ . allout-widgets-count-buttons-in-region (start end)
(defun allout-widgets-count-buttons-in-region (start end)
"Debugging/diagnostic tool - count overlays with 'button' property in region."
(interactive "r")
(setq start (or start (point-min))
end (or end (point-max)))
(if (> start end) (let ((interim start)) (setq start end end interim)))
(let ((button-overlays (delq nil
(mapcar (function (lambda (o)
(if (overlay-get o 'button)
(overlays-in start end)))))
(length button-overlays)))
;;;_ : Run unit tests:
(defun allout-widgets-run-unit-tests ()
......@@ -4489,8 +4489,9 @@ Topic exposure is marked with text-properties, to be used by
;; advance to just after end of this annotation:
(setq next (allout-next-single-char-property-change
(point) 'allout-was-hidden nil end))
(overlay-put (make-overlay prev next nil 'front-advance)
'category 'allout-exposure-category)
(let ((o (make-overlay prev next nil 'front-advance)))
(overlay-put o 'category 'allout-exposure-category)
(overlay-put o 'evaporate t))
(allout-deannotate-hidden prev next)
(setq prev next)
(if next (goto-char next)))))
......@@ -356,6 +356,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of
(const alt) (const hyper)
(const super)) "23.1")
(ns-antialias-text ns boolean "23.1")
(ns-auto-hide-menu-bar ns boolean "24.0")
;; process.c
(delete-exited-processes processes-basics boolean)
;; syntax.c
2011-03-29 Julien Danjou <>
* mm-view.el (mm-display-inline-fontify): Use `set-normal-mode' with
local variables disabled rather than `normal-mode'.
2011-03-26 Chong Yidong <>
* proto-stream.el: Changes preparatory to merging open-protocol-stream
......@@ -603,9 +603,10 @@ If MODE is not set, try to find mode automatically."
;; I find font-lock a bit too verbose.
(font-lock-verbose nil))
(setq buffer-file-name (mm-handle-filename handle))
(set (make-local-variable 'enable-local-variables) nil)
(if mode
(funcall mode)
;; The mode function might have already turned on font-lock.
(unless (symbol-value 'font-lock-mode)
......@@ -2151,7 +2151,7 @@ If INITIAL is non-nil, it specifies the initial input string."
(setq done t))))))
(and history (add-to-history history ido-selected))
(add-to-history (or history 'minibuffer-history) ido-selected)
(defun ido-edit-input ()
......@@ -211,7 +211,7 @@ until a successful connection is made."
:type '(repeat string))
(defcustom imap-process-connection-type nil
"*Value for `process-connection-type' to use for Kerberos4, GSSAPI and SSL.
"*Value for `process-connection-type' to use for Kerberos4, GSSAPI, shell, and SSL.
The `process-connection-type' variable controls the type of device
used to communicate with subprocesses. Values are nil to use a
pipe, or t or `pty' to use a pty. The value has no effect if the
......@@ -770,6 +770,7 @@ sure of changing the value of `foo'."
(let* ((port (or port imap-default-port))
(coding-system-for-read imap-coding-system-for-read)
(coding-system-for-write imap-coding-system-for-write)
(process-connection-type imap-process-connection-type)
(process (start-process
name buffer shell-file-name shell-command-switch
......@@ -8,8 +8,6 @@
* dispnew.c (update_window) [PERIODIC_PREEMPTION_CHECKING]:
Omit unused local var.
2011-03-27 Paul Eggert <>
* keyboard.c (parse_modifiers_uncached, parse_modifiers):
Don't assume string length fits in int.
(keyremap_step, read_key_sequence): Use size_t for sizes.
......@@ -62,12 +60,86 @@
* fns.c (get_key_arg): Now accepts and returns size_t, and returns
0 if not found, not -1. All callers changed.
2011-03-26 Paul Eggert <>
* alloc.c (garbage_collect): Don't assume stack size fits in int.
(stack_copy_size): Now size_t, not int.
(stack_copy, stack_copy_size): Define only if MAX_SAVE_STACK > 0.
2011-03-28 Juanma Barranquero <>
* coding.c (encode_designation_at_bol): Remove parameter `charbuf_end',
unused since 2002-03-01T01:17:24Z! and 2008-02-01T16:01:31Z!
All callers changed.
* lisp.h (multibyte_char_to_unibyte):
* character.c (multibyte_char_to_unibyte): Remove parameter `rev_tbl',
unused since 2002-03-01T01:16:34Z! and 2008-02-01T16:01:31Z!
* character.h (CHAR_TO_BYTE8):
* cmds.c (internal_self_insert):
* editfns.c (general_insert_function):
* keymap.c (push_key_description):
* search.c (Freplace_match):
* xdisp.c (message_dolog, set_message_1): All callers changed.
2011-03-28 Stefan Monnier <>
* keyboard.c (safe_run_hook_funcall): New function.
(safe_run_hooks_1, safe_run_hooks_error, safe_run_hooks): On error,
don't set the hook to nil, but remove the offending function instead.
(Qcommand_hook_internal): Remove, unused.
(syms_of_keyboard): Don't initialize Qcommand_hook_internal nor define
* eval.c (enum run_hooks_condition): Remove.
(funcall_nil, funcall_not): New functions.
(run_hook_with_args): Call each function through a `funcall' argument.
Remove `cond' argument, now redundant.
(Frun_hooks, Frun_hook_with_args, Frun_hook_with_args_until_success)
(Frun_hook_with_args_until_failure): Adjust accordingly.
(run_hook_wrapped_funcall, Frun_hook_wrapped): New functions.
2011-03-28 Juanma Barranquero <>
* dispextern.h (string_buffer_position): Remove declaration.
* print.c (strout): Remove parameter `multibyte', unused since
1999-08-21T19:30:21Z! All callers changed.
* search.c (boyer_moore): Remove parameters `len', `pos' and `lim',
never used since function introduction in 1998-02-08T21:33:56Z!
All callers changed.
* w32.c (_wsa_errlist): Use braces for struct initializers.
* xdisp.c (string_buffer_position_lim): Remove parameter `w',
never used since function introduction in 2001-03-09T18:41:50Z!
All callers changed.
(string_buffer_position): Likewise. Also, make static (it's never
used outside xdisp.c).
(cursor_row_p): Remove parameter `w', unused since
2000-10-17T16:08:57Z! All callers changed.
(decode_mode_spec): Remove parameter `precision', introduced during
Gerd Moellmann's rewrite at 1999-07-21T21:43:52Z!, but never used.
All callers changed.
2011-03-27 Jan Djärv <>
* nsterm.m (syms_of_nsterm): Use doc: for ns-auto-hide-menu-bar.
2011-03-27 Anders Lindgren <>
* nsterm.m (ns_menu_bar_is_hidden): New variable.
(ns_constrain_all_frames, ns_menu_bar_should_be_hidden)
(ns_update_auto_hide_menu_bar): New functions.
(ns_update_begin): Call ns_update_auto_hide_menu_bar.
(applicationDidBecomeActive): Call ns_update_auto_hide_menu_bar and
(constrainFrameRect): Return at once if ns_menu_bar_should_be_hidden.
(syms_of_nsterm): DEFVAR ns-auto-hide-menu-bar, init to Qnil.
2011-03-27 Jan Djärv <>
* nsmenu.m (runDialogAt): Remove argument to timer_check.
2011-03-27 Glenn Morris <>
* syssignal.h: Replace RETSIGTYPE with void.
......@@ -232,13 +232,10 @@ translate_char (Lisp_Object table, int c)
/* Convert ASCII or 8-bit character C to unibyte. If C is none of
them, return (C & 0xFF).
The argument REV_TBL is now ignored. It will be removed in the
future. */
them, return (C & 0xFF). */
multibyte_char_to_unibyte (int c, Lisp_Object rev_tbl)
multibyte_char_to_unibyte (int c)
if (c < 0x80)
return c;
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