1
0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-19 18:13:55 +00:00
Commit Graph

110280 Commits

Author SHA1 Message Date
Michael Heerdegen
587feed443 * lisp/emacs-lisp/eldoc.el (eldoc-highlight-function-argument):
Use font-lock-keyword-face for macros and special forms.

Fixes: debbugs:8345
2013-02-17 20:30:27 -05:00
Glenn Morris
a51e9ff76c Merge from emacs-24; up to 2012-12-20T05:05:41Z!dmantipov@yandex.ru 2013-02-17 11:01:46 -08:00
Eli Zaretskii
ae11bda519 Fix bug #13735 with network streams on MS-Windows.
Revert changes to w32proc.c done since 2012-11-30T09:23:15Z!eliz@gnu.org.

Do NOT merge to trunk!

 src/w32proc.c (new_child): Remove the loop that attempted to salvage
 slots of dead processes.
 (new_child, delete_child, find_child_pid): Don't insist on
 procinfo.hProcess be NULL for a process slot to be considered
 inactive, or be non-NULL to be considered active.
 (reader_thread): Don't set the FILE_AT_EOF flag of a file
 descriptor if the corresponding child was deleted and its
 char_avail handle is NULL.
 (reap_subprocess): Don't reset the FILE_AT_EOF flag.
 (sys_select): Don't pass a NULL process handle to
 WaitForMultipleObjects.

Fixes: debbugs:13735 debbugs:13546
2013-02-17 20:17:34 +02:00
Stefan Monnier
913274cbdc Don't use font-lock-syntax-table in lisp modes.
* lisp/font-lock.el (lisp-font-lock-keywords-1, lisp-font-lock-keywords-2):
Don't assume all identifier chars have syntax word.
* lisp/emacs-lisp/lisp-mode.el (lisp-mode-variables):
Remove bar-not-symbol.  Adjust callers.
(lisp-mode-variables): Don't set a font-lock-syntax-table.
2013-02-17 11:58:12 -05:00
Stefan Monnier
2f73da9c57 Prefer message1' over message'.
* src/xml.c (init_libxml2_functions):
* src/sound.c (sound_warning):
* src/sheap.c (report_sheap_usage):
* src/process.c (wait_reading_process_output):
* src/msdos.c (XMenuActivate):
* src/macros.c (Fstart_kbd_macro, Fend_kbd_macro):
* src/keyboard.c (top_level_1):
* src/editfns.c (Fmessage, Fmessage_box):
* src/callint.c (Fcall_interactively):
* src/fns.c (Fyes_or_no_p): Prefer `message1' over `message'.
2013-02-17 11:49:27 -05:00
Leo Liu
53db1d8b92 * net/rcirc.el (rcirc-keepalive): Fix invalid timer error. 2013-02-18 00:26:38 +08:00
Eli Zaretskii
fd80c659d2 Fix bug #13723 with redrawing vertical border in GUI sessions.
src/xdisp.c (x_draw_vertical_border): For a window that is neither
 the leftmost nor the rightmost, redraw both the left and the right
 vertical borders.
2013-02-17 18:22:11 +02:00
Daiki Ueno
a801007559 lisp/gnus/mml2015.el (mml2015-epg-find-usable-key): handle revoked user-id 2013-02-17 12:46:28 +00:00
Jan Djärv
fd9547e88b Move scroll-bar-adjust-thumb-portion.
* xterm.c (syms_of_xterm): Move scroll-bar-adjust-thumb-portion ...

* frame.c (syms_of_frame): ... to here.
2013-02-17 11:41:33 +01:00
Glenn Morris
1bb1e03834 * lisp/menu-bar.el (menu-bar-tools-menu): Fix case of EDE entry. 2013-02-16 19:40:38 -08:00
Glenn Morris
668187120a Add a very basic bisecting guide 2013-02-16 17:40:14 -08:00
Glenn Morris
f05e2ff2e3 * lisp/image-mode.el (image-mode-map): Add image-dired menu entry. 2013-02-16 16:50:41 -08:00
Glenn Morris
e630f18a8c * lisp/image-dired.el (tumme): Make this alias obsolete. 2013-02-16 16:45:53 -08:00
Glenn Morris
bfc58a84b2 * lisp/gnus/shr.el (shr-put-image): Use image-multi-frame-p if available. 2013-02-16 16:38:03 -08:00
Glenn Morris
6d4cb47e63 A few small TODO and CONTRIBUTE updates 2013-02-16 12:24:50 -08:00
Glenn Morris
ed8d7fcaa2 Generalize "animated" images to "multi-frame" images
* lisp/image.el (image-animated-types): Remove.
(image-multi-frame-p): Rename from image-animated-p, and generalize.
(image-animated-p): Make obsolete alias.
(image-animate, image-nth-frame, image-animate-timeout):
Use image-multi-frame-p.
(image-animate-timeout): If no delay, use image-default-frame-delay.

* lisp/image-mode.el (image-mode, image-toggle-animation):
Use image-multi-frame-p.
(image-mode): Adjust startup message for a multi-frame image.

* lisp/gnus/shr.el (shr-put-image): Only animate images that specify a delay.
This is consistent with the old image-animated-p behavior.

* etc/NEWS: Add placeholder for this.

Fixes: debbugs:10739
2013-02-16 11:56:50 -08:00
Glenn Morris
783b7b7551 * lisp/image-mode.el (image-mode-map): Give it a menu. 2013-02-16 11:20:21 -08:00
Michael Albinus
61addbc212 * net/tramp-cache.el (tramp-connection-properties): New customer option.
(tramp-get-connection-property): Use it.

* net/tramp-compat.el (top): Require 'trampver.

* net/tramp-sh.el (tramp-remote-process-environment): Set
tramp-autoload cookie.
2013-02-16 18:44:00 +01:00
Michael Albinus
2150b4715f * tramp.texi (Top, Configuration): Insert section `Android shell
setup' in menu.
(Android shell setup): New section.
(Connection types, Default Method)
(Frequently Asked Questions): Mention "scp" instead of "scpc".
(External methods): Remove "scpc" and "rsyncc" entries.
(Frequently Asked Questions): Remove entry about ControlPersist.
2013-02-16 18:38:37 +01:00
Kevin Ryde
a9bc03e28e * lisp/info-look.el (info-lookup-select-mode): If major-mode has no
info-lookup-alist entry then search up derived-mode-parent.

Fixes: debbugs:8660
2013-02-16 12:20:43 -05:00
Eli Zaretskii
c793958519 Remove functions and macros unused on MS-Windows.
src/w32.c (sys_chown): Remove unused function.

 nt/inc/ms-w32.h (chown, logb): Remove, unused.
2013-02-16 16:16:07 +02:00
Eli Zaretskii
cd91fb4b0a Don't use __STDC__ on MS-Windows unless necessary (Bug #9066).
nt/inc/ms-w32.h (__STDC__): Fiddle with value only for MSVC.

 src/w32term.c <input_signal_count>: Declare 'volatile' unconditionally.
2013-02-16 15:59:37 +02:00
Eli Zaretskii
f277993be3 Don't set h_errno on MS-Windows except in gethostbyname.
See http://lists.gnu.org/archive/html/emacs-devel/2013-02/msg00293.html
and the following discussion for the details.

 src/w32.c (set_errno): Reset h_errno and don't set it to any other
 value.  Set errno instead.
 (check_errno): Reset h_errno.
 (sys_socket, socket_to_fd, sys_bind, sys_connect)
 (sys_gethostname, sys_getservbyname, sys_getpeername)
 (sys_shutdown, sys_setsockopt, sys_listen, sys_getsockname)
 (sys_accept, sys_recvfrom, sys_sendto, fcntl, sys_read): Don't set
 h_errno.
 (sys_gethostbyname): Set h_errno only errors detected.
2013-02-16 13:08:49 +02:00
Jambunathan K
2b0afdd959 (read-regexp): Add regexp for symbol at point to the defaults (Bug#13687).
* lisp/replace.el (read-regexp): Tighten the regexp that matches tag.
When tag is retrieved with `find-tag-default', use regexp that
matches tag at point.  Also update docstring.
2013-02-16 14:56:42 +05:30
Eli Zaretskii
a7a84eea2d Fix bug #13725 with file notifications on MS-Windows.
lisp/autorevert.el (auto-revert-notify-add-watch): With 'w32notify',
 add watch for the file, not its parent directory, since w32notify
 sets up the watch for the directory internally.
2013-02-16 11:13:40 +02:00
Glenn Morris
99e619b617 Add variables for default/minimum animated image frame delay
* lisp/image.el (image-default-frame-delay): New variable.
(image-animated-p): Use image-default-frame-delay.
(image-minimum-frame-delay): New constant.
(image-animate-timeout): Use image-minimum-frame-delay.
2013-02-15 19:39:12 -08:00
Glenn Morris
c0211c4e37 Add commands for navigating multi-frame images
* lisp/image.el (image-nth-frame): New, split from image-animate-timeout.
(image-animate-timeout): Use image-nth-frame.

* lisp/image-mode.el (image-goto-frame, image-next-frame)
(image-previous-frame): New commands.
(image-mode-map): Add new frame commands.

* etc/NEWS: Mention this.
2013-02-15 19:29:39 -08:00
Jonas Bernoulli
6b6d804b1e * emacs-lisp/tabulated-list.el (tabulated-list-print-col):
If col-desc already has help-echo, use it.

Fixes: debbugs:13563
2013-02-15 18:50:44 -08:00
Didier Verna
e5b246e9f3 * lisp/net/network-stream.el (network-stream-open-starttls):
Check that response to the starttls-command is non-nil.

Fixes: debbugs:13706
2013-02-15 18:45:24 -08:00
Glenn Morris
fe2219e202 url-http-wait-for-headers-change-function fix for bug#13598
* lisp/url/url-http.el (url-http-wait-for-headers-change-function):
Avoid prematurely finding the end of headers when they arrive line-by-line.
2013-02-15 21:05:32 -05:00
Glenn Morris
bb9dfee1d6 Display a mode-line frame counter for animated images
* lisp/image.el (image-current-frame): New variable.
(image-animate-timeout): Set image-current-frame.

* lisp/image-mode.el (image-mode): For animated images,
display a frame counter via mode-line-process.
2013-02-15 20:58:20 -05:00
Glenn Morris
ef5ae980aa * lisp/font-lock.el (lisp-font-lock-keywords-1): Add defvar-local. 2013-02-15 20:55:31 -05:00
Stefan Monnier
6c8f113e70 * lisp/simple.el (eval-expression): Let `exp' set the mark.
Fixes: debbugs:13724
2013-02-15 18:47:50 -05:00
Alan Mackenzie
f852f6d8c0 emacs-lisp/easy-mmode.el (define-globalized-minor-mode): When a global
minor mode has been enabled, call the minor mode function for a new
buffer once only, after the major mode hook, whilst allowing that hook
explicitly to disable the minor mode.
(MODE-disable-in-buffer): new (generated) function.
(disable-MODE): new (generated) buffer local variable.
2013-02-15 20:01:51 +00:00
Jambunathan K
8d9f189f40 ido, iswitchb, icomplete: Use C-.' and C-,' for cycling (Bug#13708)
* lisp/icomplete.el (icomplete-minibuffer-map): Unbind `C-s' and `C-r'.
Bind `C-.' and `C-,' to `icomplete-forward-completions' and
`icomplete-backward-completions'.

* lisp/ido.el (ido-init-completion-maps): Bind `C-.' and `C-,' to
`ido-next-match' and `ido-prev-match' resply.

* lisp/iswitchb.el (iswitchb-read-buffer): Bind `C-.' and `C-,' to
`iswitchb-next-match' and `iswitchb-prev-match' resply.
2013-02-16 01:09:50 +05:30
Eli Zaretskii
b2af991a2f Remove unneeded bits of commit 2013-02-15T09:41:31Z!eliz@gnu.org merged from release branch. 2013-02-15 21:37:29 +02:00
Jambunathan K
d7e76a8929 Fix bug#13708
* lisp/icomplete.el (icomplete-minibuffer-map): Unbind `C-s' and `C-r'.
Bind `C-.' and `C-,' to `icomplete-forward-completions' and
`icomplete-backward-completions'.

* lisp/ido.el (ido-init-completion-maps): Bind `C-.' and `C-,' to
`ido-next-match' and `ido-prev-match' resply.

* lisp/iswitchb.el (iswitchb-read-buffer): Bind `C-.' and `C-,' to
`iswitchb-next-match' and `iswitchb-prev-match' resply.
2013-02-16 00:49:29 +05:30
Paul Eggert
e454145b09 * process.c (h_errno) [!HAVE_H_ERRNO]: Remove unused decl. 2013-02-15 11:08:11 -08:00
Eli Zaretskii
ef9c57e27a Fix bug #13720 with auto-save-timeout less than 4 seconds.
src/keyboard.c (read_char): Fix calculation of auto-save time out
 when auto-save-timeout is less than 4.
2013-02-15 20:52:16 +02:00
Glenn Morris
d64d97e537 Merge from emacs-24; up to 2012-12-19T19:51:40Z!monnier@iro.umontreal.ca 2013-02-15 09:31:12 -08:00
Eli Zaretskii
a7727d05be Fix commit 2013-02-15T09:41:31Z!eliz@gnu.org for bug #13546. 2013-02-15 15:14:26 +02:00
Dmitry Antipov
0063fdb148 * composite.c (fill_gstring_header): Remove useless prototype.
Break long line.
* lisp.h (message_dolog, compile_pattern): Adjust prototype.
* print.c (PRINTDECLARE, print_object):
* search.c (compile_pattern, fast_looking_at, search_buffer):
(simple_search, boyer_moore, Freplace_match):
* xdisp.c (c_string_pos, number_of_chars, message_dolog):
(get_overlay_arrow_glyph_row, display_mode_element):
(decode_mode_spec_coding, message3):
* xfaces.c (face_at_string_position): Use bool for booleans.
Adjust comments.
2013-02-15 16:26:42 +04:00
Glenn Morris
1d461514ab Auto-commit of generated files. 2013-02-15 07:17:45 -05:00
Glenn Morris
0f63df79f0 Auto-commit of generated files. 2013-02-15 06:17:38 -05:00
Eli Zaretskii
ef862e206a Allow deleted processes to be reaped by SIGCHLD handler on MS-Windows.
src/w32proc.c (new_child): Free up to 2 slots of dead processes at a
 time.  Improve diagnostics in DebPrint.
 (reader_thread): If cp->char_avail is NULL, set the FILE_AT_EOF
 flag, so that sys_select could have a chance of noticing that this
 process is dead, and call a SIGCHLD handler for it.  Improve
 diagnostics in DebPrint.
 (reap_subprocess): Reset the FILE_AT_EOF flag set by
 reader_thread.
 (sys_select): Watch a process whose procinfo.hProcess is non-NULL
 even if its char_avail is NULL.  Allows to reap subprocesses that
 were forcibly deleted by delete-process.  (Bug#13546)
2013-02-15 11:41:31 +02:00
Eli Zaretskii
bcf7fe2aef Improve error reporting as part of solving bug #13546 on MS-Windows.
src/w32.c (sys_socket, sys_bind, sys_connect, sys_gethostname)
 (sys_gethostbyname, sys_getservbyname, sys_getpeername)
 (sys_shutdown, sys_setsockopt, sys_listen, sys_getsockname)
 (sys_accept, sys_recvfrom, sys_sendto, fcntl): In case of failure,
 make sure errno is set to an appropriate value.  (Bug#13546)
 (socket_to_fd): Add assertion against indexing fd_info[] with a
 value that is out of bounds.
 (sys_accept): If fd is negative, do not set up the child_process
 structure for reading.
2013-02-15 11:01:13 +02:00
Paul Eggert
648e5523fb Merge from emacs-24; up to 2012-12-19T13:01:16Z!michael.albinus@gmx.de 2013-02-14 22:35:54 -08:00
Glenn Morris
dec2a32292 * lisp/play/fortune.el (fortune-compile): Simplify and fix previous change.
Since file-newer-than-p returns non-nil if FILE2 does not exist,
the actual fix for bug#5338 is just a one-liner. But there is no test
case or explanation of what the issue actually is in bug#5338, so one
has to wonder if the initial (file-exists-p fortune-dat) test was
there for a reason...
2013-02-14 20:30:11 -05:00
Paul Eggert
974c7646ec Backport GCPRO fix from trunk.
The bug was reported for AIX before today's changes.
I reproduced the problem on Fedora 17 x86-64 when setting
GC_MARK_STACK by hand, and I presume it occurs with default
configurations on HP-UX and Unixware.
Trunk fix on 2013-01-14 by Dmitry Antipov <dmantipov@yandex.ru>:
Fix compilation with GC_MARK_STACK == GC_USE_GCPROS_AS_BEFORE.
* eval.c (eval_sub): Protect `form' from being GCed before its
car and cdr becomes protected with the backtrace entry.

Fixes: debbugs:13650
2013-02-14 14:08:38 -08:00
Paul Eggert
35b3a27e67 Fix AIX port.
* configure.ac (DATA_START, DATA_SEG_BITS): Set to 0x20000000 on AIX.
(GC_MARK_STACK): Do not set to GC_USE_GCPROS_AS_BEFORE, as that
runs afoul of some other bug in Emacs, and the default value
GC_MAKE_GCPROS_NOOPS has been tested and works.
* src/lisp.h (XPNTR) [!USE_LSB_TAG && DATA_SEG_BITS]:
Fix bug introduced in 2012-07-27 change.  DATA_SEG_BITS, if set,
was #undeffed earlier, so it cannot be used as a macro here.
Use the constant and not the macro.  Tested on AIX.
* src/unexaix.c: Revert 2013-02-11 and 2013-02-12 changes to this
file.  They're almost surely OK but we're just before a release so
we should avoid changes unless they're clearly needed.  Instead,
make the following minor change:
(ADDR_CORRECT): New macro.

Fixes: debbugs:13650
2013-02-14 12:05:10 -08:00