Kenichi Handa [Mon, 16 Jul 2012 22:09:08 +0000 (07:09 +0900)]
merge trunk
Paul Eggert [Mon, 4 Jun 2012 06:03:19 +0000 (23:03 -0700)]
* xdisp.c (note_mode_line_or_margin_highlight): Pacify gcc -Wall.
Stefan Monnier [Mon, 4 Jun 2012 01:05:17 +0000 (21:05 -0400)]
* lisp/emacs-lisp/cl-lib.el: Rename from cl.el.
* lisp/emacs-lisp/cl.el: New compatibility file.
* emacs-lisp/cl-lib.el, lisp/emacs-lisp/cl-seq.el, lisp/emacs-lisp/cl-macs.el:
* lisp/emacs-lisp/cl-extra.el: Rename all top-level functions and variables
to obey the "cl-" prefix.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1): Adjust to new name.
Glenn Morris [Sun, 3 Jun 2012 23:49:12 +0000 (16:49 -0700)]
Remove lib-src/rcs-checkin
This script isn't used by Emacs, and I can't imagine anyone else is
using it any more either... From the commentary:
"This script is intended to be used to convert files with an
old-Emacs-style version history for use with VC (the Emacs 19
version-control interface), which likes to use RCS as its back end."
* lib-src/rcs-checkin: Remove file.
* lib-src/Makefile.in (INSTALLABLE_SCRIPTS, STAMP_INST_SCRIPTS):
Remove rcs-checkin.
(stamp-rcs-checkin): Remove.
* INSTALL, make-dist: Remove rcs-checkin.
* admin/quick-install-emacs (PUBLIC_LIBSRC_SCRIPTS): Remove rcs-checkin.
* doc/man/rcs-checkin.1: Remove.
Glenn Morris [Sun, 3 Jun 2012 23:31:45 +0000 (16:31 -0700)]
* lisp/emacs-lisp/authors.el (authors-aliases): Addition.
Glenn Morris [Sun, 3 Jun 2012 23:28:17 +0000 (16:28 -0700)]
tool-bar-style doc fixes
* lisp/cus-start.el (tool-bar-style, tool-bar-max-label-size): Fix :version.
* src/xdisp.c (tool-bar-style): Doc fix.
Ulrich Müller [Sun, 3 Jun 2012 23:14:22 +0000 (16:14 -0700)]
Workaround dumping problem on PaX-enabled Linux kernels
* configure.in (PAXCTL): Check for paxctl.
* src/Makefile.in (PAXCTL): Define.
(temacs$(EXEEXT)): Disable memory randomization for the temacs
binary via PaX flags if the paxctl utility is available.
(emacs$(EXEEXT), bootstrap-emacs$(EXEEXT)):
Restore PaX flags to their default.
Fixes: debbugs:11398
Glenn Morris [Sun, 3 Jun 2012 23:07:48 +0000 (16:07 -0700)]
* etc/NEWS: Update for renamed variable.
* lisp/image.el (imagemagick-types-inhibit): Bump :version.
Stefan Merten [Sun, 3 Jun 2012 17:20:24 +0000 (19:20 +0200)]
rst.el: Add comments.
(rst-transition, rst-adornment): New faces.
(rst-adornment-faces-alist): Make default safe to reevaluate.
Fixes
http://sourceforge.net/tracker/?func=detail&atid=422030&aid=
3479603&group_id=38414.
Improve customization tags.
(rst-define-level-faces): Clarify meaning.
Chong Yidong [Sun, 3 Jun 2012 14:37:13 +0000 (22:37 +0800)]
Fix legibility of compilation mode-line messages.
* lisp/progmodes/compile.el (compilation-mode-line-fail)
(compilation-mode-line-run, compilation-mode-line-exit): New
faces.
(compilation-start, compilation-handle-exit): Use them.
* etc/themes/wheatgrass-theme.el:
* etc/themes/deeper-blue-theme.el:
* etc/themes/tango-dark-theme.el:
* etc/themes/tsdh-dark-theme.el: Add compilation-mode-line-fail,
compilation-mode-line-run, and compilation-mode-line-exit faces.
* etc/themes/manoj-dark-theme.el: Remove :family attributes.
Fixes: debbugs:11032
Jack Duthen [Sun, 3 Jun 2012 11:10:44 +0000 (19:10 +0800)]
Improve ediff and which-func integration.
* lisp/progmodes/which-func.el (which-func-update-ediff-windows): New
function. Use it in ediff-select-hook.
Fixes: debbugs:11478
Chong Yidong [Sun, 3 Jun 2012 10:54:22 +0000 (18:54 +0800)]
Allow clicking mouse-3 on mode line to change coding system.
* lisp/bindings.el (mode-line-coding-system-map): Allow using mouse-3
to invoke set-buffer-file-coding-system.
(mode-line-mule-info-help-echo): Update help text.
Fixes: debbugs:289
Chong Yidong [Sun, 3 Jun 2012 10:23:49 +0000 (18:23 +0800)]
Make mode line help-echo visible for unibyte buffers.
* src/xdisp.c (decode_mode_spec_coding): Display a space for a unibyte
buffer.
* lisp/bindings.el (mode-line-mule-info-help-echo)
(mode-line-read-only-help-echo, mode-line-modified-help-echo):
New functions.
(mode-line-mule-info, mode-line-modified): Use them.
(mode-line-eol-desc, propertized-buffer-identification):
Consistency fixes for help text.
Fixes: debbugs:11226
Chong Yidong [Sun, 3 Jun 2012 09:59:00 +0000 (17:59 +0800)]
* xdisp.c (note_mode_line_or_margin_highlight): Fix last change.
Chong Yidong [Sun, 3 Jun 2012 09:03:23 +0000 (17:03 +0800)]
Implement default help-echo for mode line.
* lisp/bindings.el: Remove explicit help-echo from format-mode-line.
(mode-line-front-space, mode-line-end-spaces)
(mode-line-misc-info): New variables.
(mode-line-modes, mode-line-position): Move the default value to
the variable definition.
(mode-line-default-help-echo): New defcustom.
* src/buffer.c (buffer_local_value_1): New function, split from
Fbuffer_local_value; can return Qunbound.
(Fbuffer_local_value): Use it.
(Vmode_line_format): Docstring tweaks.
* src/xdisp.c (calc_pixel_width_or_height): Use Fbuffer_local_value.
(note_mode_line_or_margin_highlight): If there is no help echo,
use mode-line-default-help-echo. Handle the case where the mouse
position is past the end of the mode line string.
* doc/lispref/modes.texi (Mode Line Data): Use "mode line construct"
terminology for consistency.
Paul Eggert [Sat, 2 Jun 2012 21:01:07 +0000 (14:01 -0700)]
* sysdep.c (system_process_attributes): Improve comment.
Stefan Monnier [Sat, 2 Jun 2012 19:21:34 +0000 (15:21 -0400)]
* lisp/simple.el (execute-extended-command): Set real-this-command.
* src/keyboard.c: Export real-this-command to Elisp.
(syms_of_keyboard): Rename real_this_command to Vreal_this_command
and DEFVAR it. Update all users.
Fixes: debbugs:11506
Paul Eggert [Sat, 2 Jun 2012 17:03:49 +0000 (10:03 -0700)]
* minibuf.c (Fassoc_string): Remove duplicate declaration.
Paul Eggert [Sat, 2 Jun 2012 16:37:54 +0000 (09:37 -0700)]
* sysdep.c (system_process_attributes) [SOLARIS2 && HAVE_PROCFS]:
Convert pctcpu and pctmem to Lisp float properly.
Let the compiler fold better, as 100.0/0x8000 is exact.
Stefan Merten [Sat, 2 Jun 2012 12:29:21 +0000 (14:29 +0200)]
(rst-mode-map): Fix meaning of C-M-a / C-M-e.
Chong Yidong [Sat, 2 Jun 2012 10:56:09 +0000 (18:56 +0800)]
Remove incorrect uses of "modeline".
* ansi-color.el (ansi-color-faces-vector): Change default faces.
* cus-edit.el (mode-line):
* dframe.el (dframe-mouse-hscroll):
* emacs-lisp/re-builder.el:
* emacs-lisp/easy-mmode.el (define-minor-mode):
* frame.el (set-frame-name):
* help.el (lookup-minor-mode-from-indicator):
* net/rcirc.el (rcirc-activity-string, rcirc-short-buffer-name):
* progmodes/cc-cmds.el (c-toggle-auto-newline)
(c-toggle-hungry-state):
* progmodes/antlr-mode.el (antlr-language-alist):
* progmodes/idlw-shell.el (idlwave-shell-electric-stop-line-face):
* progmodes/vhdl-mode.el (vhdl-mode):
* progmodes/which-func.el (which-func, which-func-cleanup-function):
* term/ns-win.el (ns-face-at-pos):
* term/sup-mouse.el (sup-mouse-report):
* textmodes/flyspell.el (flyspell-mode-line-string):
* textmodes/ispell.el (ispell-highlight-face):
* textmodes/reftex-global.el:
* vc/vc-arch.el (vc-arch-mode-line-string):
* vc/vc-cvs.el (vc-cvs-mode-line-string):
* vc/vc-git.el (vc-git-mode-line-string):
* vc/vc-hooks.el (vc-display-status)
(vc-default-mode-line-string):
* vc/vc-mtn.el (vc-mtn-mode-line-string): Doc fixes.
* dired.el (dired-sort-set-mode-line): Rename from
dired-sort-set-modeline. All callers changed.
* foldout.el (foldout-mode-line-string): Rename from
foldout-modeline-string. All callers changed.
(foldout-update-mode-line): Rename from foldout-update-modeline.
* strokes.el (strokes-lighter): Rename from
strokes-modeline-string.
* subr.el (redraw-modeline): Make into obsolete alias.
* calendar/timeclock.el (timeclock-mode-line-display): Rename from
timeclock-modeline-display. Make old name an alias.
(timeclock-update-mode-line): Likewise. All callers changed.
(timeclock-mode-line-display): No need to check before using
add-hook.
(timeclock-relative, timeclock-day-over-hook)
(timeclock-use-elapsed, timeclock-mode-string)
(timeclock-mode-line-display): Doc fix, "modeline" -> "mode line".
* emulation/crisp.el (crisp-mode-mode-line-string): Rename from
crisp-mode-modeline-string.
* erc-track.el (erc-track, erc-track-faces-priority-list)
(erc-track-faces-normal-list, erc-track-find-face)
(erc-track-modified-channels): Fix modeline -> mode line in docs.
* eshell/esh-mode.el (eshell-status-in-mode-line): Rename from
eshell-status-in-modeline.
* org-clock.el (org-clock-string-limit)
(org-clock-modeline-total, org-clock-task-overrun-text)
(org-clock-mode-line-entry): Doc fix, "modeline" -> "mode line".
* play/solitaire.el (solitaire-build-mode-line): Rename from
solitaire-build-modeline. All callers changed.
* play/zone.el (zone-hiding-mode-line): Rename from
zone-hiding-modeline. All callers changed.
(zone): Remove unusued `modeline-hidden-level' property.
* progmodes/xscheme.el (xscheme-mode-line-initialize): Rename from
xscheme-modeline-initialize. All callers changed.
* textmodes/sgml-mode.el (html-face-tag-alist)
(html-tag-face-alist): Use mode-line face instead of obsolete
alias modeline.
Fixes: debbugs:10329
Glenn Morris [Sat, 2 Jun 2012 10:20:27 +0000 (06:20 -0400)]
Auto-commit of loaddefs files.
Glenn Morris [Sat, 2 Jun 2012 10:17:26 +0000 (06:17 -0400)]
Auto-commit of generated files.
Stefan Merten [Sat, 2 Jun 2012 09:43:51 +0000 (11:43 +0200)]
Always require `cl'.
Andreas Schwab [Sat, 2 Jun 2012 08:52:27 +0000 (10:52 +0200)]
* alloc.c (CONS_BLOCK_SIZE): Account for padding at the end of
cons_block.
Chong Yidong [Sat, 2 Jun 2012 07:30:07 +0000 (15:30 +0800)]
Add more enabled ImageMagick types.
* lisp/image.el (imagemagick-enabled-types): Rename from
imagemagick-types-enable. Add many more types.
(imagemagick-types-inhibit): Change default to nil.
(imagemagick-filter-types): Caller changed.
Paul Eggert [Fri, 1 Jun 2012 20:49:03 +0000 (13:49 -0700)]
* xfns.c (x_set_tool_bar_lines) [USE_GTK]: Adjust to bitfield change.
Stefan Monnier [Fri, 1 Jun 2012 20:36:00 +0000 (16:36 -0400)]
* lisp/emacs-lisp/cl-macs.el: Use backquotes.
(cl-transform-function-property): Use eval-and-compile rather than
abusing `require'.
(defstruct): Use declare-function instead of with-no-warnings.
Stefan Monnier [Fri, 1 Jun 2012 20:24:17 +0000 (16:24 -0400)]
* lisp/gnus/nntp.el: Stop the `letf' madness.
(nntp--report-1): New var.
(nntp-report): Merge nntp-report-1 into it.
(nntp-with-open-group-function): Set nntp--report-1 instead of modifying
the nntp-report function.
Stefan Monnier [Fri, 1 Jun 2012 20:12:11 +0000 (16:12 -0400)]
* lisp/gnus/auth-source.el: Fix comment-style to follow the convention.
Stefan Monnier [Fri, 1 Jun 2012 19:47:54 +0000 (15:47 -0400)]
* lisp/emacs-lisp/bytecomp.el: Fix last change.
(byte-compile-output-docform): Re-add the print-circle bindings.
(byte-compile-fix-header): Use #$ just because it's shorter.
(byte-compile-output-file-form): Remove defun/defmacro.
Fixes: debbugs:11594
Paul Eggert [Fri, 1 Jun 2012 18:26:21 +0000 (11:26 -0700)]
Remove --disable-maintainer-mode option from 'configure'. (Bug#11555)
It is confusingly named and rarely useful. See, for example,
<http://lists.gnu.org/archive/html/emacs-devel/2011-12/msg00089.html>.
* INSTALL.BZR: Don't mention --disable-maintainer-mode.
* Makefile.in (MAINTAINER_MODE_FLAG): Remove; all uses removed.
* configure.in: Remove --disable-maintainer-mode.
(USE_MAINTAINER_MODE, MAINT): Remove.
* admin/make-tarball.txt: Don't worry about maintainer mode.
* etc/NEWS: Mention this.
Martin Rudalics [Fri, 1 Jun 2012 13:44:48 +0000 (15:44 +0200)]
Remove obsolete binding in choose-completion.
* simple.el (choose-completion): Remove now obsolete binding for
owindow.
Michael Albinus [Fri, 1 Jun 2012 13:23:26 +0000 (15:23 +0200)]
* net/tramp.el (tramp-check-for-regexp): Search from buffer end,
in order to avoid "Stack overflow in regexp matcher".
Glenn Morris [Fri, 1 Jun 2012 10:18:34 +0000 (06:18 -0400)]
Auto-commit of loaddefs files.
Andrew Beals [Fri, 1 Jun 2012 07:10:49 +0000 (00:10 -0700)]
* etc/spook.lines: Additions. (tiny change)
Fixes: debbugs:11598
Dmitry Antipov [Fri, 1 Jun 2012 03:41:03 +0000 (07:41 +0400)]
For a 'struct window', replace some Lisp_Object fields to
bitfields where appropriate, remove unused fields.
* window.h (struct window): Remove unused 'last_mark_x' and
'last_mark_y' fields. Rename 'mini_p' field to 'mini',
change it's type from Lisp_Object to bitfield.
Change type of 'force_start', 'optional_new_start',
'last_had_star', 'update_mode_line' and 'start_at_line_beg'
fields from Lisp_Object to bitfield. Adjust users accordingly.
Glenn Morris [Thu, 31 May 2012 20:06:04 +0000 (16:06 -0400)]
ChangeLog merge fix
Glenn Morris [Thu, 31 May 2012 17:21:31 +0000 (13:21 -0400)]
Fix imagemagick-filter-types for imagemagick-types-enable = t.
Glenn Morris [Thu, 31 May 2012 17:14:46 +0000 (13:14 -0400)]
Split off imagemagick-filter-types from imagemagick-register-types
* lisp/image.el: (imagemagick-filter-types): New function. (Bug#7406)
(imagemagick-register-types): Use imagemagick-filter-types.
* etc/NEWS: Mention this.
Glenn Morris [Thu, 31 May 2012 07:22:33 +0000 (00:22 -0700)]
Add option imagemagick-types-enable
* lisp/image.el: For clarity, call imagemagick-register-types at
top-level, rather than relying on a custom :initialize.
(imagemagick-types-enable): New option.
(imagemagick-register-types): Respect imagemagick-types-inhibit.
If disabling support, remove elements altogether rather
than using an impossible regexp.
(imagemagick-types-inhibit): Give it the default init function.
* src/image.c (Fimagemagick_types): Doc fix.
* etc/NEWS: Mention this.
Fixes: debbugs:11557
Paul Eggert [Thu, 31 May 2012 06:51:43 +0000 (23:51 -0700)]
Pacify gcc -Wdouble-precision when using Xaw.
* xterm.c (xaw_jump_callback, x_set_toolkit_scroll_bar_thumb)
[HAVE_X_WINDOWS && USE_TOOLKIT_SCROLL_BARS && !USE_MOTIF && !USE_GTK]:
Use 'float' consistently, rather than 'float' in most places
and 'double' in a couple of places.
Chong Yidong [Thu, 31 May 2012 06:08:06 +0000 (14:08 +0800)]
Merge from emacs-24; up to 2012-04-24T21:47:24Z!michael.albinus@gmx.de
Stefan Monnier [Thu, 31 May 2012 05:56:57 +0000 (13:56 +0800)]
Fix long filename handling of byte-compile-fix-header.
* lisp/emacs-lisp/bytecomp.el (byte-compile-fix-header): Handle
arbitrary file name lengths (Bug#11585).
Paul Eggert [Thu, 31 May 2012 05:08:37 +0000 (22:08 -0700)]
Remove obsolete '#define static' cruft.
* etc/PROBLEMS: Remove obsolete '#define static' cruft.
* lwlib/xlwmenu.c [emacs]: Include "bitmaps/gray.xbm".
(gray_bitmap_width, gray_bitmap_height, gray_bitmap_bits) [!emacs]:
Remove; all uses replaced with definiens.
* src/s/hpux10-20.h (_FILE_OFFSET_BITS): Don't #undef.
This #undef was "temporary" in 2000; it is no longer needed
now that '#define static' has gone away.
* src/xfns.c, src/xterm.h (gray_bitmap_width, gray_bitmap_height)
(gray_bitmap_bits): Remove; no longer needed.
All uses replaced with definiens.
* src/xterm.c: Include "bitmaps/gray.xbm".
Stefan Monnier [Thu, 31 May 2012 01:41:17 +0000 (21:41 -0400)]
Add `declare' for `defun'. Align `defmacro's with it.
* lisp/emacs-lisp/easy-mmode.el (define-minor-mode)
(define-globalized-minor-mode): Don't autoload the var definitions.
* lisp/emacs-lisp/byte-run.el: Use lexical-binding.
(defun-declarations-alist, macro-declarations-alist): New vars.
(defmacro, defun): Use them.
(make-obsolete, define-obsolete-function-alias)
(make-obsolete-variable, define-obsolete-variable-alias):
Use `declare'.
(macro-declaration-function): Mark obsolete.
* lisp/emacs-lisp/autoload.el: Use lexical-binding.
(make-autoload): Add `expansion' arg. Rely more on macro expansion.
Juri Linkov [Thu, 31 May 2012 01:09:41 +0000 (04:09 +0300)]
* etc/NEWS: Doc fix.
Fixes: debbugs:11574
Paul Eggert [Wed, 30 May 2012 19:23:37 +0000 (12:23 -0700)]
Clean up __executable_start, monstartup when --enable-profiling.
The following changes affect the code only when profiling.
* dispnew.c (__executable_start): Rename from safe_bcopy.
Define only on platforms that need it.
* emacs.c: Include <sys/gmon.h> when profiling.
(_mcleanup): Remove decl, since <sys/gmon.h> does it now.
(__executable_start): Remove decl, since lisp.h does it now.
(safe_bcopy): Remove decl; no longer has that name.
(main): Coalesce #if into single bit of code, for simplicity.
Cast pointers to uintptr_t, since standard libraries want integers
and not pointers.
* lisp.h (__executable_start): New decl.
Eli Zaretskii [Wed, 30 May 2012 18:09:17 +0000 (21:09 +0300)]
Fix bug #11587 with a crash in an Info buffer under linum-mode.
src/xdisp.c (handle_stop): Detect whether we have overlay strings
loaded by testing it->current.overlay_string_index to be
non-negative, instead of checking whether n_overlay_strings is
positive.
Agustín Martín [Wed, 30 May 2012 16:14:37 +0000 (18:14 +0200)]
ispell.el: Define `ispell-with-no-warnings' as a macro. Deal with obsolete `interactive-p'
* Current `ispell-with-no-warnings' definition does not avoid warnings.
Use a macro definition taken from orgmode.
* Deal with a couple of occurrences of obsolete `interactive-p'.
Jim Meyering [Wed, 30 May 2012 14:20:45 +0000 (22:20 +0800)]
Improve call-process-region error message.
* src/callproc.c (Fcall_process_region): Include directory component
in mkstemp error message.
Fixes: debbugs:11586
Chong Yidong [Wed, 30 May 2012 14:08:58 +0000 (22:08 +0800)]
* keymap.c (describe_map_tree): Revert 2011-07-07 change.
* doc.c (Fsubstitute_command_keys): Doc fix.
Fixes: debbugs:1169
Paul Eggert [Wed, 30 May 2012 07:59:44 +0000 (00:59 -0700)]
* alloc.c, lisp.h (make_pure_vector): Now static.
Stefan Monnier [Wed, 30 May 2012 03:59:42 +0000 (23:59 -0400)]
* lisp/emacs-lisp/byte-run.el (defmacro, defun): Move from C.
(macro-declaration-function): Move var from C code.
(macro-declaration-function): Define function with defalias.
* lisp/emacs-lisp/macroexp.el (macroexpand-all-1):
* lisp/emacs-lisp/cconv.el (cconv-convert, cconv-analyse-form):
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Don't handle
defun/defmacro any more.
* lisp/emacs-lisp/bytecomp.el (byte-compile-arglist-signature):
Provide fallback for unknown arglist.
(byte-compile-arglist-warn): Change calling convention.
(byte-compile-output-file-form): Move print-vars binding.
(byte-compile-output-docform): Simplify accordingly.
(byte-compile-file-form-defun, byte-compile-file-form-defmacro)
(byte-compile-defmacro-declaration): Remove.
(byte-compile-file-form-defmumble): Generalize to defalias.
(byte-compile-output-as-comment): Return byte-positions.
Simplify callers accordingly.
(byte-compile-lambda): Use `assert'.
(byte-compile-defun, byte-compile-defmacro): Remove.
(byte-compile-file-form-defalias):
Use byte-compile-file-form-defmumble.
(byte-compile-defalias-warn): Remove.
* src/eval.c (Fdefun, Fdefmacro, Vmacro_declaration_function):
Move to byte-run.el.
(Fautoload): Do the hash-doc more carefully.
* src/data.c (Fdefalias): Purify definition, except for keymaps.
(Qdefun): Move from eval.c.
* src/lisp.h (Qdefun): Remove.
* src/lread.c (read1): Tiny simplification.
* lib-src/make-docfile.c: Improve comment style.
(search_lisp_doc_at_eol): New function.
(scan_lisp_file): Use it.
Paul Eggert [Tue, 29 May 2012 21:33:38 +0000 (14:33 -0700)]
Fix ChangeLog entry by negating its 1st sentence.
Stefan Merten [Tue, 29 May 2012 20:14:18 +0000 (22:14 +0200)]
Silence `checkdoc-ispell' errors where possible. Fix authors. Improve
comments. Improve loading of `cl'.
(rst-mode-abbrev-table): Merge definition.
(rst-mode): Make sure `font-lock-defaults' is buffer local.
(rst-define-key, rst-deprecated-keys, rst-call-deprecated): Refactor.
Ulf Jasper [Tue, 29 May 2012 19:42:49 +0000 (21:42 +0200)]
icalendar-tests: Fix Bug#11525 -- Add icalendar-import-format-uid
2012-05-29 Ulf Jasper <ulf.jasper@web.de>
* calendar/icalendar.el
(icalendar-export-region): Export UID properly.
2012-05-29 Leo Liu <sdl.web@gmail.com>
* calendar/icalendar.el (icalendar-import-format): Add
`icalendar-import-format-uid' (Bug#11525).
(icalendar-import-format-uid): New.
(icalendar--parse-summary-and-rest, icalendar--format-ical-event):
Export UID.
Eli Zaretskii [Tue, 29 May 2012 16:15:12 +0000 (19:15 +0300)]
Fix bug #11405 with MSVC build of emacsclientw.
lib-src/makefile.w32-in ($(BLD)/emacsclientw.exe): Use $(MWINDOWS)
instead of a literal -mwindows, which is not supported by MSVC.
nt/nmake.defs (MWINDOWS): Define as "-subsystem:windows -entry:mainCRTStartup".
Suggested by Fabrice Popineau <fabrice.popineau@supelec.fr>.
nt/gmake.defs (MWINDOWS): Define as "-mwindows".
Troels Nielsen [Tue, 29 May 2012 16:13:38 +0000 (09:13 -0700)]
Do not avoid creating empty evaporating overlays (Bug#9642).
* buffer.c (Fmove_overlay): Reinstate the earlier fix for
Bug#9642, but explicitly check that the buffer the overlay would
be moved to is live and rearrange lines to make sure that errors
will not put the overlay in an inconsistent state.
(Fdelete_overlay): Cosmetics.
Eli Zaretskii [Tue, 29 May 2012 16:01:05 +0000 (19:01 +0300)]
Don't call r_alloc_inhibit_buffer_relocation from search.c.
src/search.c (search_buffer): Remove calls to
r_alloc_inhibit_buffer_relocation, as it is now called by
maybe_unify_char, which was the cause of relocation of buffer text
in bug#11519.
Stefan Monnier [Tue, 29 May 2012 14:28:02 +0000 (10:28 -0400)]
Fix minor corner case bugs in byte compilation and pcase.
* lisp/emacs-lisp/byte-opt.el (byte-compile-inline-expand): Don't re-preprocess
functions from byte-compile-function-environment.
* lisp/emacs-lisp/bytecomp.el (byte-compile-constp): Treat #'v as a constant.
(byte-compile-close-variables): Bind byte-compile--outbuffer here...
(byte-compile-from-buffer): ...rather than here.
* lisp/emacs-lisp/pcase.el (pcase--expand): Accept different sets of vars in
different alternative patterns.
(pcase-codegen): Be more careful to preserve identity.
(pcase--u1): Don't forget to mark vars as used.
Troels Nielsen [Tue, 29 May 2012 12:22:49 +0000 (20:22 +0800)]
Fix active minibuffer case for window-deletable-p.
* window.el (window-deletable-p): Avoid deleting the root window
of a frame with an active minibuffer.
Martin Rudalics [Tue, 29 May 2012 12:21:45 +0000 (20:21 +0800)]
* lisp/simple.el (choose-completion): Use quit-window.
Fixes: debbugs:11567
Chong Yidong [Tue, 29 May 2012 11:51:19 +0000 (19:51 +0800)]
* whitespace.el (whitespace-cleanup): Fix whitespace-empty-at-bob-regexp usage.
Fixes: debbugs:11492
Aaron S. Hawley [Tue, 29 May 2012 11:41:45 +0000 (19:41 +0800)]
* vc.el (vc-revert, vc-rollback): Dont kill vc-diff buffer on revert.
Fixes: debbugs:11488
Juri Linkov [Tue, 29 May 2012 09:46:06 +0000 (12:46 +0300)]
* lisp/isearch.el (isearch-mode-map): Bind `M-s _' to `isearch-toggle-symbol'.
Bind `M-s c' to `isearch-toggle-case-fold'.
(search-map): Bind `M-s _' to `isearch-forward-symbol'.
(isearch-forward): Add `M-s _' to the docstring.
(isearch-forward-symbol, isearch-toggle-case-fold)
(isearch-symbol-regexp): New functions.
Fixes: debbugs:11381
Juri Linkov [Tue, 29 May 2012 09:27:39 +0000 (12:27 +0300)]
* lisp/isearch.el (isearch-word): Add docstring.
(isearch-occur, isearch-search-and-update): If `isearch-word' is
a function, call it to get the regexp.
(isearch-message-prefix): If `isearch-word' holds a symbol, use its
property `isearch-message-prefix' instead of the string "word ".
(isearch-search-fun-default): For the case of `isearch-word',
return a lambda that calls re-search-forward/re-search-backward
with a regexp returned by `word-search-regexp' or by the function
in `isearch-word'.
Fixes: debbugs:11381
Juri Linkov [Tue, 29 May 2012 09:09:38 +0000 (12:09 +0300)]
* lisp/isearch.el (isearch-search-fun-default): New function.
(isearch-search-fun): Move default part to the new function
`isearch-search-fun-default'.
(isearch-search-fun-function): Set the default value to
`isearch-search-fun-default'.
* lisp/comint.el (comint-history-isearch-end):
Use `isearch-search-fun-default'.
(comint-history-isearch-search): Use `isearch-search-fun-default'
and remove spacial case for `isearch-word'.
(comint-history-isearch-wrap): Remove spacial case for
`isearch-word'.
* lisp/hexl.el (hexl-isearch-search-function):
Use `isearch-search-fun-default'.
* lisp/info.el (Info-isearch-search): Use `isearch-search-fun-default'.
Use `word-search-regexp' for `isearch-word'.
* lisp/misearch.el (multi-isearch-search-fun):
Use `isearch-search-fun-default'.
* lisp/simple.el (minibuffer-history-isearch-search):
Use `isearch-search-fun-default' and remove spacial case for
`isearch-word'.
(minibuffer-history-isearch-wrap): Remove spacial case for
`isearch-word'.
* lisp/textmodes/reftex-global.el (reftex-isearch-wrap-function):
Remove spacial case for `isearch-word'.
(reftex-isearch-isearch-search): Use `isearch-search-fun-default'.
Fixes: debbugs:11381
Paul Eggert [Tue, 29 May 2012 06:16:49 +0000 (23:16 -0700)]
Spelling fixes.
Katsumi Yamaoka [Tue, 29 May 2012 05:19:41 +0000 (05:19 +0000)]
Makefile.in (echo-info): Don't try to install info files named just ".info"
Glenn Morris [Tue, 29 May 2012 00:53:40 +0000 (17:53 -0700)]
* doc/lispintro/emacs-lisp-intro.texi: Nuke hand-written node pointers.
(dolist, dotimes): Fix sectioning.
Glenn Morris [Mon, 28 May 2012 23:35:09 +0000 (16:35 -0700)]
* emacs/ack.texi, emacs/building.texi, emacs/calendar.texi
* emacs/custom.texi, emacs/maintaining.texi, emacs/text.texi:
* misc/calc.texi, misc/dired-x.texi:
Use @LaTeX rather than La@TeX.
Fixes: debbugs:10910
Glenn Morris [Mon, 28 May 2012 23:28:27 +0000 (16:28 -0700)]
* doc/misc/sc.texi: Nuke hand-written node pointers.
Fix top-level menu to match actual node order.
Eli Zaretskii [Mon, 28 May 2012 17:22:40 +0000 (20:22 +0300)]
Fix bug #11513 with raise-frame on MS-Windows.
src/w32term.c (my_bring_window_to_top): New function.
(x_raise_frame): Use handle returned by DeferWindowPos, which
could be different from the original one. Call
my_bring_window_to_top instead of my_set_foreground_window.
src/w32fns.c (w32_wnd_proc): Accept and process WM_EMACS_BRINGTOTOP
by calling BringWindowToTop.
src/w32term.h (WM_EMACS_BRINGTOTOP): New message.
(WM_EMACS_END): Increase by one.
Eli Zaretskii [Mon, 28 May 2012 17:00:18 +0000 (20:00 +0300)]
Remove HAVE_SYSINFO from nt/config.nt, followup to 2012-05-28T00:46:33Z!eggert@cs.ucla.edu.
nt/config.nt (HAVE_SYSINFO): Remove; unused.
Eli Zaretskii [Mon, 28 May 2012 16:50:10 +0000 (19:50 +0300)]
Avoid buffer text relocations in calls to STRING_CHAR_* macros.
src/charset.c (maybe_unify_char): Inhibit relocation of buffer text
for the duration of call to load_charset, to avoid problems with
callers of maybe_unify_char that access buffer text through C
pointers.
src/ralloc.c (r_alloc_inhibit_buffer_relocation): Increment and
decrement the inhibition flag, instead of just setting or
resetting it.
Fixes: debbugs:11519
Eli Zaretskii [Mon, 28 May 2012 16:17:35 +0000 (19:17 +0300)]
Fix subtle problem with redirection in nt/configure.bat.
nt/configure.bat (genmakefiles): Move the redirection away from the
end of the command, to avoid excess whitespace at the end of Make
variables created at configure time, and also avoid things like
"FOO1>>config.settings", where "1" gets interpreted as the file
descriptor and eaten up. This fixes breakage introduced by the
last change, without reintroducing the bug fixed by that change.
Agustín Martín [Mon, 28 May 2012 16:11:15 +0000 (18:11 +0200)]
textmodex/{ispell,flyspell}.el: Decrease XEmacs incompatibilities.
* flyspell.el:
(flyspell-check-pre-word-p): Use `string-match'.
(flyspell-delete-region-overlays): Use alternative definition for XEmacs.
(flyspell-delete-all-overlays): Use `flyspell-delete-region-overlays'.
(flyspell-word): Use `process-kill-without-query' if XEmacs.
(flyspell-mode-on): Use `interactive-p' if XEmacs.
(flyspell-incorrect-face, flyspell-duplicate-face):
Do not use `define-obsolete-face-alias' under XEmacs, but old method.
* ispell.el:
(ispell-with-no-warnings): XEmacs alternative `with-no-warnings'
definition or Emacs alias.
(ispell-command-loop, ispell-message): Use `ispell-with-no-warnings'.
(ispell-word): Do not use `region-p' if XEmacs.
Agustín Martín [Mon, 28 May 2012 14:36:27 +0000 (16:36 +0200)]
textmodes/ispell.el: Fix variable name. Show spellchecker on process start.
* (ispell-find-aspell-dictionaries): Check for
`ispell-dictionary-base-alist' instead of full `ispell-dictionary-alist'.
* (ispell-init-process): Show spellchecker when starting new Ispell process.
Glenn Morris [Mon, 28 May 2012 10:17:28 +0000 (06:17 -0400)]
Auto-commit of generated files.
Martin Rudalics [Mon, 28 May 2012 09:48:29 +0000 (11:48 +0200)]
Ugly fix for bug#11556.
* desktop.el (desktop-read): Clear previous and next buffers for all
windows and bury *Messages* buffer (bug#11556).
Paul Eggert [Mon, 28 May 2012 07:13:45 +0000 (00:13 -0700)]
* bidi.c (bidi_mirror_char): Put eassert before conversion to int.
This avoids undefined behavior that might cause the eassert
to not catch an out-of-range value.
Reto Zimmermann [Mon, 28 May 2012 03:42:18 +0000 (23:42 -0400)]
* lisp/progmodes/vhdl-mode.el: Sync with upstream 3.33.28.
http://www.iis.ee.ethz.ch/~zimmi/emacs/vhdl-mode.html#release-notes-3.33
Juanma Barranquero [Mon, 28 May 2012 01:58:42 +0000 (03:58 +0200)]
src/makefile.w32-in: Update dependencies.
Paul Eggert [Mon, 28 May 2012 00:46:33 +0000 (17:46 -0700)]
Make 'configure' a bit smaller and faster.
* configure.in (INSTALL_INFO): Set it with one call to
AC_PATH_PROG, not three.
(PKG_CONFIG): Hoist this out of PKG_CHECK_MODULES, since it's
so likely that it'll be needed.
(AC_CHECK_HEADERS_ONCE): Prefer to AC_CHECK_HEADERS where either works.
(AC_PROG_MAKE_SET): Remove; Automake does this.
(sysinfo): Do not check for this function, as it's never used.
(tzset): Check for this function just once.
* admin/CPP-DEFINES: Remove HAVE_SYSINFO.
* m4/manywarnings.m4: Sync from gnulib, incorporating the following:
2012-05-27 manywarnings: remove duplicate -Wmultichar entry
Juanma Barranquero [Sun, 27 May 2012 17:31:31 +0000 (19:31 +0200)]
lips/version.el (*-version-string): Declare.
Eli Zaretskii [Sun, 27 May 2012 13:42:13 +0000 (16:42 +0300)]
Fix the MSDOS build following gnulib update.
config.bat (lib): Create/update lib/stdalign.in-h and
lib/sys_types.in-h.
msods/sedlibmk.inp (GNULIB_GL_UNISTD_H_GETOPT, GNULIB_POSIX_OPENPT)
(GNULIB_ISATTY, GNULIB_PTSNAME_R, GNULIB_RANDOM)
(GNULIB_SETHOSTNAME, HAVE_POSIX_OPENPT, HAVE_PTSNAME_R)
(HAVE_RANDOM, HAVE_SETHOSTNAME, NEXT_SYS_TYPES_H)
(NEXT_AS_FIRST_DIRECTIVE_SYS_TYPES_H, REPLACE_FTRUNCATE)
(REPLACE_ISATTY, REPLACE_PTSNAME_R, REPLACE_RANDOM_R)
(REPLACE_STRTOIMAX, STDALIGN_H, WINDOWS_64_BIT_OFF_T)
(WINDOWS_64_BIT_ST_SIZE, GL_GENERATE_STDALIGN_H_TRUE)
(GL_GENERATE_STDALIGN_H_FALSE): Edit as appropriate for DJGPP.
(cat FOO): Edit into "sed -e '' FOO >>".
Eli Zaretskii [Sun, 27 May 2012 12:27:07 +0000 (15:27 +0300)]
Fix last change in bidi_mirror_char.
Andreas Schwab [Sun, 27 May 2012 12:18:35 +0000 (14:18 +0200)]
* unexmacosx.c (copy_data_segment): Truncate after 16 characters
when referring to sectname field in printf format.
Eli Zaretskii [Sun, 27 May 2012 12:11:23 +0000 (15:11 +0300)]
Fix the MS-Windows build broken by 1995-02-25T20:57:45Z!rms@gnu.org.
lib/makefile.w32-in ($(BLD)/md5.$(O)):
($(BLD)/sha1.$(O)):
($(BLD)/sha256.$(O)):
($(BLD)/sha512.$(O)): Depend on $(EMACS_ROOT)/nt/inc/stdalign.h.
Suggested by Christoph Scholtes <cschol2112@googlemail.com>.
lib/getopt_.h: Regenerate.
nt/inc/stdalign.h: New file.
Fixes: debbugs:11527
Glenn Morris [Sun, 27 May 2012 10:19:11 +0000 (06:19 -0400)]
Auto-commit of generated files.
Juri Linkov [Sun, 27 May 2012 09:45:54 +0000 (12:45 +0300)]
* lisp/emacs-lisp/lisp-mode.el (eval-defun-2): Use `eval-sexp-add-defvars'
after the `eval-defun-1' specialcaseing
like in `edebug-eval-defun'.
* lisp/emacs-lisp/edebug.el (edebug-eval-defun): Set `face-documentation'
like in `eval-defun-1'.
Fixes: debbugs:10181
Paul Eggert [Sun, 27 May 2012 09:12:09 +0000 (02:12 -0700)]
Assume gnulib does largefile.
Gnulib does the largefile configuration anyway, so when configure.in
invokes AC_SYS_LARGEFILE, that bloats 'configure' unnecessarily.
* admin/merge-gnulib (GNULIB_MODULES): Add largefile.
* configure.in (AC_SYS_LARGEFILE): Remove.
* lib/gnulib.mk: Autoupdate.
Paul Eggert [Sun, 27 May 2012 07:51:09 +0000 (00:51 -0700)]
* lisp.h [REL_ALLOC]: Omit duplicate prototypes.
Only r_alloc_inhibit_buffer_relocation needed to be added;
the others were already declared.
Paul Eggert [Sun, 27 May 2012 07:32:46 +0000 (00:32 -0700)]
* bidi.c (bidi_mirror_char): Don't possibly truncate the integer
before checking whether it's out of range. Put the check inside
eassert. See
<http://lists.gnu.org/archive/html/emacs-devel/2012-05/msg00485.html>.
Glenn Morris [Sun, 27 May 2012 02:30:29 +0000 (19:30 -0700)]
* doc/misc/cl.texi, doc/misc/dired-x.texi: Nuke hand-written node pointers.
Some associated fixes, including not messing with chapno in cl.texi.
Glenn Morris [Sun, 27 May 2012 02:13:54 +0000 (19:13 -0700)]
* doc/emacs/emacs.texi: Simplify following removal of node pointers.
Glenn Morris [Sun, 27 May 2012 01:34:14 +0000 (18:34 -0700)]
Nuke hand-written node pointers in doc/lispref
Let makeinfo figure them out, as is recommended.
Glenn Morris [Sun, 27 May 2012 01:25:06 +0000 (18:25 -0700)]
Nuke hand-written node pointers in doc/emacs
Let makeinfo figure them out, as is recommended.
Glenn Morris [Sun, 27 May 2012 01:06:44 +0000 (18:06 -0700)]
Merge from emacs-24; up to 2012-04-24T08:35:02Z!lekktu@gmail.com