]> git.eshelyaron.com Git - emacs.git/log
emacs.git
11 years agomerge from trunk
Joakim Verona [Tue, 27 Aug 2013 16:12:47 +0000 (18:12 +0200)]
merge from trunk

11 years ago* lisp/isearch.el (isearch-other-meta-char): Don't store kmacro commands
Juri Linkov [Tue, 27 Aug 2013 16:06:16 +0000 (19:06 +0300)]
* lisp/isearch.el (isearch-other-meta-char): Don't store kmacro commands
in the keyboard macro.

Fixes: debbugs:15126
11 years ago* lisp/isearch.el (isearch-quote-char): Comment out converting unibyte
Juri Linkov [Tue, 27 Aug 2013 15:57:16 +0000 (18:57 +0300)]
* lisp/isearch.el (isearch-quote-char): Comment out converting unibyte
to multibyte, thus syncing with its `quoted-insert' counterpart.

Fixes: debbugs:15166
11 years agomerge from trunk
Joakim Verona [Tue, 27 Aug 2013 15:57:09 +0000 (17:57 +0200)]
merge from trunk

11 years ago* configure.ac (DOCMISC_INFO_W32): Typo fix.
Glenn Morris [Tue, 27 Aug 2013 15:44:07 +0000 (08:44 -0700)]
* configure.ac (DOCMISC_INFO_W32): Typo fix.

11 years agomerge from trunk
Joakim Verona [Tue, 27 Aug 2013 13:00:13 +0000 (15:00 +0200)]
merge from trunk

11 years agoAdd missing argument in call of get-largest-window (Bug#15185).
Martin Rudalics [Tue, 27 Aug 2013 12:46:00 +0000 (14:46 +0200)]
Add missing argument in call of get-largest-window (Bug#15185).

* window.el (display-buffer-use-some-window): Add missing
argument in call of get-largest-window (Bug#15185).  Reported by
Stephen Leake.

11 years agomerge from trunk
Joakim Verona [Tue, 27 Aug 2013 10:31:36 +0000 (12:31 +0200)]
merge from trunk

11 years agoAuto-commit of generated files.
Glenn Morris [Tue, 27 Aug 2013 10:17:45 +0000 (06:17 -0400)]
Auto-commit of generated files.

11 years agomerge from trunk
Joakim Verona [Tue, 27 Aug 2013 09:36:42 +0000 (11:36 +0200)]
merge from trunk

11 years ago* configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
Dmitry Antipov [Tue, 27 Aug 2013 09:21:46 +0000 (13:21 +0400)]
* configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): No spaces!

11 years agomerge from trunk
Joakim Verona [Tue, 27 Aug 2013 08:22:31 +0000 (10:22 +0200)]
merge from trunk

11 years ago* doc/misc/efaq-w32.texi (EMACSVER): Get it from emacsver.texi.
Glenn Morris [Tue, 27 Aug 2013 08:14:58 +0000 (01:14 -0700)]
* doc/misc/efaq-w32.texi (EMACSVER): Get it from emacsver.texi.

11 years agomerge from trunk
Joakim Verona [Tue, 27 Aug 2013 08:12:21 +0000 (10:12 +0200)]
merge from trunk

11 years ago* doc/misc/Makefile.in (webhack): Remove; it's nothing to do with Emacs.
Glenn Morris [Tue, 27 Aug 2013 08:04:08 +0000 (01:04 -0700)]
* doc/misc/Makefile.in (webhack): Remove; it's nothing to do with Emacs.
Presumably it is some Gnus thing.

11 years agoMerge from emacs-24; up to 2013-01-03T01:56:56Z!rgm@gnu.org
Glenn Morris [Tue, 27 Aug 2013 08:01:13 +0000 (01:01 -0700)]
Merge from emacs-24; up to 2013-01-03T01:56:56Z!rgm@gnu.org

11 years agoMove source for Emacs on MS Windows FAQ here from Emacs webpages repository
Glenn Morris [Tue, 27 Aug 2013 07:57:39 +0000 (00:57 -0700)]
Move source for Emacs on MS Windows FAQ here from Emacs webpages repository

* Makefile.in (mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, check-declare): Remove pointless subshells.
Check cd return value.

* configure.ac (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New output variables.
* Makefile.in (check-info-dir): Ignore efaq-w32.

* admin/admin.el (manual-misc-manuals): Use INFO_COMMON rather than
INFO_TARGETS.

* doc/misc/efaq-w32.texi: Move here from the web-pages repository.

* doc/misc/Makefile.in (DOCMISC_DVI_W32, DOCMISC_HTML_W32, DOCMISC_INFO_W32)
(DOCMISC_PDF_W32, DOCMISC_PS_W32): New configure output variables.
(INFO_COMMON, INFO_INSTALL): New derivations of INFO_TARGETS.
(DVI_TARGETS, HTML_TARGETS, PDF_TARGETS, PS_TARGETS):
Add DOCMISC_*_W32 variables.
(echo-info): Use INFO_INSTALL rather than INFO_TARGETS.
(efaq_w32_deps): New variable.
(efaq-w32, $(buildinfodir)/efaq-w32$(INFO_EXT), efaq-w32.dvi)
(efaq-w32.pdf, efaq-w32.html): New rules.
(clean): Remove efaq-w32 products.

11 years agomerge from trunk
Joakim Verona [Tue, 27 Aug 2013 07:12:22 +0000 (09:12 +0200)]
merge from trunk

11 years ago* Makefile.in (mostlyclean, clean, distclean, bootstrap-clean)
Glenn Morris [Tue, 27 Aug 2013 06:58:08 +0000 (23:58 -0700)]
* Makefile.in (mostlyclean, clean, distclean, bootstrap-clean)
(maintainer-clean, check-declare): Remove pointless subshells.
Check cd return value.

11 years agomerge from trunk
Joakim Verona [Tue, 27 Aug 2013 04:36:29 +0000 (06:36 +0200)]
merge from trunk

11 years ago* xterm.h (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE:)
Dmitry Antipov [Tue, 27 Aug 2013 04:23:54 +0000 (08:23 +0400)]
* xterm.h (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE:)
* nsterm.h (FONT_TYPE_FOR_UNIBYTE, FONT_TYPE_FOR_MULTIBYTE):
Remove the leftovers.
* gtkutil.c (toplevel): Do not declare Qxft but include
font.h to do so.
* image.c (toplevel): Do not declare Vlibrary_cache because
it's already done in lisp.h.

11 years agomerge from trunk
Joakim Verona [Tue, 27 Aug 2013 04:06:30 +0000 (06:06 +0200)]
merge from trunk

11 years ago* lisp.h (Mouse_HLInfo): Move from here...
Dmitry Antipov [Tue, 27 Aug 2013 03:52:21 +0000 (07:52 +0400)]
* lisp.h (Mouse_HLInfo): Move from here...
* dispextern.h (Mouse_HLInfo): ...to here and offload lisp.h.
(reset_mouse_highlight): New function.
* msdos.c (dos_set_window_size, IT_update_begin)
(internal_terminal_init):
* nsterm.m (ns_update_window_end, x_free_frame_resources)
(ns_initialize_display_info):
* w32console.c (initialize_w32_display):
* w32term.c (x_update_window_end, x_free_frame_resources)
(w32_initialize_display_info):
* xterm.c (x_update_window_end, x_free_frame_resources, x_term_init):
* window.c (Fdelete_other_windows_internal):
* xdisp.c (clear_mouse_face, cancel_mouse_face): Use it.
* termchar.h (toplevel):
* xterm.h (toplevel): Include dispextern.h.

11 years agomerge from trunk
Joakim Verona [Tue, 27 Aug 2013 02:56:46 +0000 (04:56 +0200)]
merge from trunk

11 years ago* lisp/progmodes/python.el (python-font-lock-keywords): Don't return nil
Stefan Monnier [Tue, 27 Aug 2013 02:41:41 +0000 (22:41 -0400)]
* lisp/progmodes/python.el (python-font-lock-keywords): Don't return nil
from a matcher-function unless there's no more matches.

Fixes: debbugs:15161
11 years agomerge from trunk
Joakim Verona [Mon, 26 Aug 2013 22:31:42 +0000 (00:31 +0200)]
merge from trunk

11 years agoMinor merge from gnulib (mostly just for texinfo.tex).
Paul Eggert [Mon, 26 Aug 2013 22:17:31 +0000 (15:17 -0700)]
Minor merge from gnulib (mostly just for texinfo.tex).

11 years agomerge from trunk
Joakim Verona [Mon, 26 Aug 2013 21:46:30 +0000 (23:46 +0200)]
merge from trunk

11 years agoFix minor problems found by static checking.
Paul Eggert [Mon, 26 Aug 2013 21:31:50 +0000 (14:31 -0700)]
Fix minor problems found by static checking.

* image.c (XGetPixel, XPutPixel) [HAVE_NS]: Now static.
(expect): Avoid nested-if warning.
(x_build_heuristic_mask) [HAVE_NS]: Avoid unused-var warning.
* nsmenu.m (fillWithWidgetValue:): Avoid type warning.
* nsterm.h, nsterm.m (ns_select):
* xgselect.c, xgselect.h (xg_select):
Adjust signature to better match pselect's.
* nsterm.m (ns_select):
Don't set *TIMEOUT, since pselect doesn't.
* regex.c (whitespace_regexp): Now const_re_char *, to avoid
diagnostic about assigning const char * to it.
* xfaces.c (x_display_info) [HAVE_NS]: Remove; unused.

11 years agomerge from trunk
Joakim Verona [Mon, 26 Aug 2013 20:46:27 +0000 (22:46 +0200)]
merge from trunk

11 years ago* src/lread.c (substitute_object_recurse): Handle hash-tables as well.
Stefan Monnier [Mon, 26 Aug 2013 20:33:21 +0000 (16:33 -0400)]
* src/lread.c (substitute_object_recurse): Handle hash-tables as well.

Fixes: debbugs:15190
11 years agomerge from trunk
Joakim Verona [Mon, 26 Aug 2013 18:22:04 +0000 (20:22 +0200)]
merge from trunk

11 years agoFix unlikely core dump in init_tty, and simplify terminfo case.
Paul Eggert [Mon, 26 Aug 2013 18:10:30 +0000 (11:10 -0700)]
Fix unlikely core dump in init_tty, and simplify terminfo case.

* term.c (init_tty) [TERMINFO]: Fix check for buffer overrun.
The old version incorrectly dumped core if malloc returned a
buffer containing only non-NUL bytes.
(init_tty): Do not allocate or free termcap buffers; the
struct does that for us now.
* termchar.h (TERMCAP_BUFFER_SIZE) [!TERMINFO]: New constant.
(struct tty_display_info): Define members termcap_term_buffer and
termcap_strings_buffer only if !TERMINFO, since terminfo doesn't
use them.  Allocate them directly in struct rather than indirectly
via a pointer, to simplify init_tty.

11 years agomerge from trunk
Joakim Verona [Mon, 26 Aug 2013 17:42:14 +0000 (19:42 +0200)]
merge from trunk

11 years ago* frame.c (check_minibuf_window): Initialize 'window' properly,
Paul Eggert [Mon, 26 Aug 2013 17:31:00 +0000 (10:31 -0700)]
* frame.c (check_minibuf_window): Initialize 'window' properly,

so that Emacs reliably aborts later if 'window' is not initialized.

11 years agomerge from trunk
Joakim Verona [Mon, 26 Aug 2013 16:42:27 +0000 (18:42 +0200)]
merge from trunk

11 years agoFix ChangeLog typo.
Dmitry Antipov [Mon, 26 Aug 2013 16:29:52 +0000 (20:29 +0400)]
Fix ChangeLog typo.

11 years agomerge from trunk
Joakim Verona [Mon, 26 Aug 2013 15:57:23 +0000 (17:57 +0200)]
merge from trunk

11 years ago* gtkutil.c (xg_initialize): Set gtk-menu-bar-accel to "" instead
Jan Djärv [Mon, 26 Aug 2013 15:44:56 +0000 (17:44 +0200)]
* gtkutil.c (xg_initialize): Set gtk-menu-bar-accel to "" instead
of VoidSymbol.

Fixes: debbugs:15154
11 years agomerge from trunk
Joakim Verona [Mon, 26 Aug 2013 15:42:34 +0000 (17:42 +0200)]
merge from trunk

11 years ago* lispref/variables.texi (File Local Variables): Don't recommend quoting!
Stefan Monnier [Mon, 26 Aug 2013 15:28:24 +0000 (11:28 -0400)]
* lispref/variables.texi (File Local Variables): Don't recommend quoting!

11 years agomerge from trunk
Joakim Verona [Mon, 26 Aug 2013 14:17:54 +0000 (16:17 +0200)]
merge from trunk

11 years ago* lisp.h (Mouse_HLInfo): Drop set-but-unused members
Dmitry Antipov [Mon, 26 Aug 2013 14:00:55 +0000 (18:00 +0400)]
* lisp.h (Mouse_HLInfo): Drop set-but-unused members
mouse_face_beg_y and mouse_face_end_y.
* xdisp.c (note_tool_bar_highlight, mouse_face_from_buffer_pos)
(mouse_face_from_string_pos, note_mode_line_or_margin_highlight):
Adjust users and update comment where appropriate.

11 years agomerge from trunk
Joakim Verona [Mon, 26 Aug 2013 13:37:08 +0000 (15:37 +0200)]
merge from trunk

11 years ago* minibuffer.el: Revert change from 2013-08-20.
Michael Albinus [Mon, 26 Aug 2013 13:17:22 +0000 (15:17 +0200)]
* minibuffer.el: Revert change from 2013-08-20.

* net/tramp.el (tramp-find-method, tramp-find-user): Mark result
with text property `tramp-default', if appropriate.
(tramp-check-proper-host): New defun.
(tramp-dissect-file-name): Do not check hostname.  Revert change
of 2013-03-18.
(tramp-backtrace): Make VEC-OR-PROC optional.

* net/tramp-adb.el (tramp-adb-maybe-open-connection):
* net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):
* net/tramp-sh.el (tramp-maybe-open-connection):
* net/tramp-smb.el (tramp-smb-maybe-open-connection): Apply
`tramp-check-proper-host'.

11 years agomerge from trunk
Joakim Verona [Mon, 26 Aug 2013 12:52:01 +0000 (14:52 +0200)]
merge from trunk

11 years agoNew function check_minibuf_window to fix bug#15183.
Martin Rudalics [Mon, 26 Aug 2013 12:39:08 +0000 (14:39 +0200)]
New function check_minibuf_window to fix bug#15183.

* frame.c (check_minibuf_window): New function.
(delete_frame, Fmake_frame_invisible, Ficonify_frame): Call
check_minibuf_window (Bug#15183).

11 years agomerge from trunk
Joakim Verona [Mon, 26 Aug 2013 11:16:55 +0000 (13:16 +0200)]
merge from trunk

11 years ago* epa-hook.el (epa-file-encrypt-to): Quote `safe-local-variable'
Tassilo Horn [Mon, 26 Aug 2013 11:03:09 +0000 (13:03 +0200)]
* epa-hook.el (epa-file-encrypt-to): Quote `safe-local-variable'
lambda expression in order to have `describe-variable' display it.

11 years agomerge from trunk
Joakim Verona [Mon, 26 Aug 2013 09:46:28 +0000 (11:46 +0200)]
merge from trunk

11 years ago* window.h (struct window): Replace last_cursor with last_cursor_vpos
Dmitry Antipov [Mon, 26 Aug 2013 09:33:37 +0000 (13:33 +0400)]
* window.h (struct window): Replace last_cursor with last_cursor_vpos
because this is the only last cursor data we need to keep and consult.
* window.c (replace_window, set_window_buffer, Fsplit_window_internal):
* xdisp.c (mark_window_display_accurate_1, try_cursor_movement):
Adjust users.

11 years agomerge from trunk
Joakim Verona [Mon, 26 Aug 2013 07:12:15 +0000 (09:12 +0200)]
merge from trunk

11 years ago* net/tramp-sh.el (tramp-sh-handle-verify-visited-file-modtime):
Michael Albinus [Mon, 26 Aug 2013 06:59:53 +0000 (08:59 +0200)]
* net/tramp-sh.el (tramp-sh-handle-verify-visited-file-modtime):
BUF can be optional.  (Bug#15186)

11 years agomerge from trunk
Joakim Verona [Mon, 26 Aug 2013 05:36:50 +0000 (07:36 +0200)]
merge from trunk

11 years agoFix recovering from possible decompression error. Since
Dmitry Antipov [Mon, 26 Aug 2013 05:32:47 +0000 (09:32 +0400)]
Fix recovering from possible decompression error.  Since
insert_from_gap doesn't always move point, we can't use PT as
the position where the partially decompressed data ends, and
should count how may bytes was produced so far.
* decompress.c (struct decompress_unwind_data): Add nbytes member.
(unwind_decompress): Really delete partially uncompressed data.
(Fzlib_decompress_region): Take decompressed data size into account.

11 years ago* alloc.c (sweep_vectors): Do not initialize 'block' twice.
Dmitry Antipov [Mon, 26 Aug 2013 05:26:06 +0000 (09:26 +0400)]
* alloc.c (sweep_vectors): Do not initialize 'block' twice.

11 years ago* syntax.c (init_syntax_once): Adjust comment and do an early
Dmitry Antipov [Mon, 26 Aug 2013 05:20:59 +0000 (09:20 +0400)]
* syntax.c (init_syntax_once): Adjust comment and do an early
initialization of Qchar_table_extra_slots just once...
* casetab.c (init_casetab_once):
* category.c (init_category_once):
* character.c (syms_of_character):
* coding.c (syms_of_coding):
* xdisp.c (syms_of_xdisp): ...and omit it here.

11 years agomerge from trunk
Joakim Verona [Sun, 25 Aug 2013 22:41:35 +0000 (00:41 +0200)]
merge from trunk

11 years agoFix broken customization in Flymake.
Xue Fuqiao [Sun, 25 Aug 2013 22:30:56 +0000 (06:30 +0800)]
Fix broken customization in Flymake.

* lisp/progmodes/flymake.el (flymake-get-real-file-name-function):
Fix broken customization.  (Bug#15184)

11 years agomerge from trunk
Joakim Verona [Sun, 25 Aug 2013 21:21:12 +0000 (23:21 +0200)]
merge from trunk

11 years agoImprove indentation of bracelists defined by macros (without "=").
Alan Mackenzie [Sun, 25 Aug 2013 21:06:07 +0000 (21:06 +0000)]
Improve indentation of bracelists defined by macros (without "=").

* progmodes/cc-engine.el (c-inside-bracelist-p): When a macro
expansion begins with "{", regard it as bracelist when it doesn't
contain a ";".

11 years agomerge from trunk
Joakim Verona [Sun, 25 Aug 2013 20:27:21 +0000 (22:27 +0200)]
merge from trunk

11 years agoAdd a question into configure.bat whether the user want to continue at
Vincent Belaïche [Sun, 25 Aug 2013 20:11:56 +0000 (22:11 +0200)]
Add a question into configure.bat whether the user want to continue at
his/her own risks.

11 years agomerge from trunk
Joakim Verona [Sun, 25 Aug 2013 19:56:43 +0000 (21:56 +0200)]
merge from trunk

11 years ago* INSTALL: Refer to INSTALL.MSYS.
Glenn Morris [Sun, 25 Aug 2013 19:46:41 +0000 (12:46 -0700)]
* INSTALL: Refer to INSTALL.MSYS.

11 years ago* nt/configure.bat: Disable it.
Glenn Morris [Sun, 25 Aug 2013 19:44:59 +0000 (12:44 -0700)]
* nt/configure.bat: Disable it.
Ref http://lists.gnu.org/archive/html/emacs-devel/2013-08/msg00705.html

11 years agomerge from trunk
Joakim Verona [Sun, 25 Aug 2013 14:07:59 +0000 (16:07 +0200)]
merge from trunk

11 years agoParse C++ inher-intro when there's a template split over 2 lines.
Alan Mackenzie [Sun, 25 Aug 2013 13:52:14 +0000 (13:52 +0000)]
Parse C++ inher-intro when there's a template split over 2 lines.

* progmodes/cc-engine.el (c-guess-basic-syntax CASE 5C): Code more
rigorously the search for "class" etc. followed by ":".

* progmodes/cc-langs.el (c-opt-<>-sexp-key): Make the value for
random languages a regexp which never matches rather than nil.

11 years agomerge from trunk
Joakim Verona [Sun, 25 Aug 2013 10:27:13 +0000 (12:27 +0200)]
merge from trunk

11 years agoHandle "/"s more accurately in test for virtual semicolons (AWK Mode).
Alan Mackenzie [Sun, 25 Aug 2013 10:09:56 +0000 (10:09 +0000)]
Handle "/"s more accurately in test for virtual semicolons (AWK Mode).

* progmodes/cc-awk.el (c-awk-one-line-possibly-open-string-re)
(c-awk-regexp-one-line-possibly-open-char-list-re)
(c-awk-one-line-possibly-open-regexp-re)
(c-awk-one-line-non-syn-ws*-re): Remove.
(c-awk-possibly-open-string-re, c-awk-non-/-syn-ws*-re)
(c-awk-space*-/-re, c-awk-space*-regexp-/-re)
(c-awk-space*-unclosed-regexp-/-re): New constants.
(c-awk-at-vsemi-p): Reformulate better to recognize "/"s which
aren't regexp delimiters.

* progmodes/cc-engine.el (c-crosses-statement-barrier-p): Add in
handling for a rare situation in AWK Mode involving unterminated
strings/regexps.

11 years agomerge from trunk
Joakim Verona [Sat, 24 Aug 2013 16:18:46 +0000 (18:18 +0200)]
merge from trunk

11 years agoAdd commentary for the last commit.
Eli Zaretskii [Sat, 24 Aug 2013 15:21:05 +0000 (18:21 +0300)]
Add commentary for the last commit.

11 years agomerge from trunk
Joakim Verona [Sat, 24 Aug 2013 13:17:24 +0000 (15:17 +0200)]
merge from trunk

11 years agoFix bug #15175 with cursor on boxed characters from display tables.
Eli Zaretskii [Sat, 24 Aug 2013 12:59:13 +0000 (15:59 +0300)]
Fix bug #15175 with cursor on boxed characters from display tables.

 src/xdisp.c (get_next_display_element): Don't apply to characters
 from a display vector the logic of setting it->end_of_box_run_p
 suitable for characters from a buffer.

11 years agomerge from trunk
Joakim Verona [Sat, 24 Aug 2013 10:27:28 +0000 (12:27 +0200)]
merge from trunk

11 years agoFix bug #15176 with setting directory times on MS-Windows.
Eli Zaretskii [Sat, 24 Aug 2013 10:15:01 +0000 (13:15 +0300)]
Fix bug #15176 with setting directory times on MS-Windows.

 src/w32.c (fdutimens): Call 'utime', which is implemented on w32.c
 to handle directories, rather than '_utime' which doesn't.

11 years agomerge from trunk
Joakim Verona [Sat, 24 Aug 2013 08:57:29 +0000 (10:57 +0200)]
merge from trunk

11 years ago* gtkutil.c (x_wm_set_size_hint): Don't set hints when maximized
Jan Djärv [Sat, 24 Aug 2013 08:43:36 +0000 (10:43 +0200)]
* gtkutil.c (x_wm_set_size_hint): Don't set hints when maximized
or fullscreen.

Fixes: debbugs:14627
11 years agomerge from trunk
Joakim Verona [Sat, 24 Aug 2013 02:36:40 +0000 (04:36 +0200)]
merge from trunk

11 years agoSystem-dependent integer overflow fixes.
Paul Eggert [Sat, 24 Aug 2013 02:23:34 +0000 (19:23 -0700)]
System-dependent integer overflow fixes.

* process.c (Fset_process_window_size): Signal an error if
the window size is outside the range supported by the lower level.
* sysdep.c (set_window_size): Return negative on error,
nonnegative on success, rather than -1, 0, 1 on not in system,
failure, success.  This is simpler.  Caller changed.
(serial_configure): Remove unnecessary initialization of local.
(procfs_get_total_memory) [GNU_LINUX]: Don't assume system memory
size fits in unsigned long; this isn't true on some 32-bit hosts.
Avoid buffer overrun if some future version of /proc/meminfo has a
variable name longer than 20 bytes.
(system_process_attributes) [__FreeBSD__]:
Don't assume hw.availpages fits in 'int'.

11 years agomerge from trunk
Joakim Verona [Fri, 23 Aug 2013 19:12:05 +0000 (21:12 +0200)]
merge from trunk

11 years ago* lisp/files.el (auto-mode-alist): Use sh-mode for .bash_history.
Glenn Morris [Fri, 23 Aug 2013 18:58:41 +0000 (14:58 -0400)]
* lisp/files.el (auto-mode-alist): Use sh-mode for .bash_history.

11 years agomerge from trunk
Joakim Verona [Fri, 23 Aug 2013 18:12:26 +0000 (20:12 +0200)]
merge from trunk

11 years agoDon't let very long directory names overrun the stack.
Paul Eggert [Fri, 23 Aug 2013 17:57:07 +0000 (10:57 -0700)]
Don't let very long directory names overrun the stack.

Fix some related minor problems involving "//", vfork.
* callproc.c (encode_current_directory): New function.
(call_process): Don't append "/"; not needed.
* fileio.c (file_name_as_directory_slop): New constant.
(file_name_as_directory): Allow SRC to be longer than SRCLEN;
this can save the caller having to alloca.
(Ffile_name_as_directory, Fdirectory_file_name, Fexpand_file_name):
Use SAFE_ALLOCA, not alloca.
(directory_file_name, Fexpand_file_name): Leave leading "//"
alone, since it can be special even on POSIX platforms.
* callproc.c (call_process):
* process.c (Fformat_network_address):
* sysdep.c (sys_subshell):
Use encode_current_directory rather than rolling our own.
(create_process): No need to encode directory; caller does that now.
* process.h (encode_current_directory): New decl.
* sysdep.c (sys_subshell): Work even if vfork trashes saved_handlers.
Rework to avoid 'goto xyzzy;'.

11 years agomerge from trunk
Joakim Verona [Fri, 23 Aug 2013 17:47:27 +0000 (19:47 +0200)]
merge from trunk

11 years ago* lisp/files.el (create-file-buffer): Rework previous change.
Glenn Morris [Fri, 23 Aug 2013 17:34:09 +0000 (13:34 -0400)]
* lisp/files.el (create-file-buffer): Rework previous change.

11 years agomerge from trunk
Joakim Verona [Fri, 23 Aug 2013 17:22:29 +0000 (19:22 +0200)]
merge from trunk

11 years ago* lisp/files.el (interpreter-mode-alist): Use tcl-mode for expect scripts.
Glenn Morris [Fri, 23 Aug 2013 17:09:09 +0000 (13:09 -0400)]
* lisp/files.el (interpreter-mode-alist): Use tcl-mode for expect scripts.

11 years ago* files.el (create-file-buffer): Handle a file whose basename is all spaces.
Glenn Morris [Fri, 23 Aug 2013 17:08:19 +0000 (13:08 -0400)]
* files.el (create-file-buffer): Handle a file whose basename is all spaces.

Fixes: debbugs:15162
11 years ago* lisp/emacs-lisp/package.el (package-buffer-info): Fix message typo.
Glenn Morris [Fri, 23 Aug 2013 16:50:39 +0000 (12:50 -0400)]
* lisp/emacs-lisp/package.el (package-buffer-info): Fix message typo.

11 years agomerge from trunk
Joakim Verona [Fri, 23 Aug 2013 15:37:15 +0000 (17:37 +0200)]
merge from trunk

11 years ago* lisp/textmodes/fill.el (fill-match-adaptive-prefix): Don't throw away
Stefan Monnier [Fri, 23 Aug 2013 15:31:45 +0000 (11:31 -0400)]
* lisp/textmodes/fill.el (fill-match-adaptive-prefix): Don't throw away
text-properties.

Fixes: debbugs:15155
11 years ago* lisp/calc/calc-keypd.el (calc-keypad-execute): `x-flush-mouse-queue' doesn't
Stefan Monnier [Fri, 23 Aug 2013 15:21:19 +0000 (11:21 -0400)]
* lisp/calc/calc-keypd.el (calc-keypad-execute): `x-flush-mouse-queue' doesn't
exist any more.
(calc-keypad-redraw): Remove unused var `pad'.
(calc-keypad-press): Remove unused var `menu'.

11 years agomerge from trunk
Joakim Verona [Fri, 23 Aug 2013 14:42:37 +0000 (16:42 +0200)]
merge from trunk

11 years agoFix bug #15155 with ignoring face remapping for strings from prefix properties.
Eli Zaretskii [Fri, 23 Aug 2013 14:25:39 +0000 (17:25 +0300)]
Fix bug #15155 with ignoring face remapping for strings from prefix properties.

 src/xdisp.c (handle_face_prop): If the default face was remapped use
 the remapped face for strings from prefix properties.

11 years agoAuto-commit of generated files.
Glenn Morris [Fri, 23 Aug 2013 11:17:33 +0000 (07:17 -0400)]
Auto-commit of generated files.

11 years agomerge from trunk
Joakim Verona [Fri, 23 Aug 2013 10:31:49 +0000 (12:31 +0200)]
merge from trunk

11 years agoAuto-commit of generated files.
Glenn Morris [Fri, 23 Aug 2013 10:17:44 +0000 (06:17 -0400)]
Auto-commit of generated files.

11 years agomerge from trunk
Joakim Verona [Fri, 23 Aug 2013 07:06:30 +0000 (09:06 +0200)]
merge from trunk

11 years agoIn display-buffer-pop-up-frame make BUFFER current (Bug#15133).
Martin Rudalics [Fri, 23 Aug 2013 06:52:19 +0000 (08:52 +0200)]
In display-buffer-pop-up-frame make BUFFER current (Bug#15133).

* window.el (display-buffer-pop-up-frame): Call pop-up-frame-function
with BUFFER current so `make-frame' will use it as the new frame's
buffer (Bug#15133).