1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-28 16:21:07 -08:00
Commit graph

120715 commits

Author SHA1 Message Date
Paul Eggert
59c414b1d0 Merge from origin/emacs-24
113fcc3 * etc/AUTHORS: Update the AUTHORS file
51c0c8d * lisp/ChangeLog: Fix a changelog entry

Conflicts:
	etc/AUTHORS
2015-03-08 18:49:27 -07:00
Paul Eggert
0dfe7002a6 Merge from origin/emacs-24
The following commit was skipped:

9869d6f Make tramp-ssh-controlmaster-options a defcustom.  Do not merge with master.
2015-03-08 18:48:47 -07:00
Paul Eggert
8e07ea1a05 Merge from origin/emacs-24
344c6ad Improve MS-Windows build instructions  (Bug#19989)
eb62887 lisp/dired.el (dired-delete-file): Doc fix.  (Bug#20021)

Conflicts:
	lisp/ChangeLog
	nt/ChangeLog
2015-03-08 18:48:35 -07:00
Paul Eggert
e427b55370 Merge from origin/emacs-24
The following commit was skipped:

69204d5 # Changelog fixes (no need to merge to trunk)
2015-03-08 18:48:18 -07:00
Sergio Durigan Junior
6df13146cc EUDC: Support BBDB >= 3
Fixes: bug#19678

Co-authored-by: Thomas Fitzsimmons <fitzsim@fitzsim.org>
* net/eudcb-bbdb.el (eudc-bbdb-field): New function.
(eudc-bbdb-filter-non-matching-record): Call eudc-bbdb-field.
(eudc-bbdb-format-record-as-result): Likewise.
2015-03-08 21:12:11 -04:00
Adam Sjøgren
6b134bcba9 lisp/gnus/gnus-notifications.el (gnus-notifications-action): Replace x-focus-frame kludge by calling gnus-select-frame-set-input-focus 2015-03-08 22:45:06 +00:00
Dmitry Gutov
e991af9228 ruby-mode: Change faces used for self, true, false and nil
Fixes: debbugs:17733

* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Use
`font-lock-constant-face' for nil, true and false.  Highlight
`self' as a keyword.
2015-03-08 22:10:45 +02:00
Dmitry Gutov
d15317cc17 Add an indent test example for bug#20026
* test/indent/ruby.rb: Add an example for bug#20026.
2015-03-08 20:57:47 +02:00
Nobuyoshi Nakada
dad0fc589c ruby-mode: Expect regexp after { or | too
Fixes: debbugs:20026

* progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Expect
beginning of regexp also after open brace or vertical bar.
2015-03-08 20:57:29 +02:00
Dmitry Gutov
d03ec1cf16 Fix test/indent/js.js
* test/indent/js.js: Set `js-indent-level' to 2. Fix indentation in an
example.
2015-03-08 20:30:23 +02:00
Nicolas Petton
113fcc3b73 * etc/AUTHORS: Update the AUTHORS file 2015-03-08 15:41:18 +01:00
Nicolas Petton
51c0c8dc70 * lisp/ChangeLog: Fix a changelog entry 2015-03-08 15:41:15 +01:00
Glenn Morris
126cd1461a # Auto-commit of loaddefs files. 2015-03-08 06:23:06 -04:00
Rasmus Pank Roulund
08534cef42 lisp/gnus/gnus-notifications: Raise frame when clicking Read; Add mark as read 2015-03-08 10:10:37 +00:00
Adam Sjøgren
0f2fd5603a lisp/gnus/message.el (message-insert-formatted-citation-line): Change %F to fall back to email address if no first name could be determined 2015-03-08 10:06:51 +00:00
Michael Albinus
bcf89ff335 Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs 2015-03-07 21:02:39 +01:00
Michael Albinus
9869d6f612 Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master.
Fixes: debbugs:20015

* net/tramp.el (tramp-ssh-controlmaster-options): Make it a
defcustom.
2015-03-07 21:02:04 +01:00
Michael Albinus
8182282319 Revert "Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master."
This reverts commit 5ab767b8dc.
2015-03-07 21:01:01 +01:00
Michael Albinus
5ab767b8dc Make tramp-ssh-controlmaster-options a defcustom. Do not merge with master.
Fixes: debbugs:20015

* net/tramp.el (tramp-ssh-controlmaster-options): Make it a defcustom.
2015-03-07 20:57:32 +01:00
Eli Zaretskii
344c6adab9 Improve MS-Windows build instructions (Bug#19989)
nt/INSTALL: Add some more installation instructions for mingw-get
 users.
2015-03-07 15:12:57 +02:00
Eli Zaretskii
e851da3540 Partially revert the fix for bug #11732
src/w32fns.c <ImmReleaseContext_Proc, ImmSetCompositionWindow_Proc>:
 Fix typedefs to be consistent with the corresponding w32 API
 signatures.
 (w32_wnd_proc) <WM_IME_STARTCOMPOSITION>: Don't invoke
 DefWindowProc if we successfully handled the message, as doing so
 causes problems in displaying selection dialogs.
2015-03-07 12:49:54 +02:00
Eli Zaretskii
eb62887e97 lisp/dired.el (dired-delete-file): Doc fix. (Bug#20021) 2015-03-07 11:55:58 +02:00
Stefan Monnier
35e2b6ab4d * lisp/gnus/*registry.el: Use slot names rather than initarg names
* lisp/gnus/registry.el (registry-lookup-breaks-before-lexbind)
(registry-search, registry-delete, registry-size, registry-insert)
(registry-reindex, registry-collect-prune-candidates, registry-lookup):
* lisp/gnus/gnus-registry.el (gnus-registry-fixup-registry)
(gnus-registry-remove-extra-data): Use slot names rather than initarg
names in `oref' and `oset'.
2015-03-06 23:50:32 -05:00
Stefan Monnier
0ea68311a5 * lisp/battery.el: Make it work on my MSI Wind
* lisp/battery.el (battery-echo-area-format): Simplify default.
(battery-linux-sysfs): Standardize on energy&power.  Accept ADP1
for AC adapter.
2015-03-06 23:42:10 -05:00
Stefan Monnier
25058c3ab8 * lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker): Don't try to
unfold `closure's since byte-compile-unfold-lambda doesn't know how to
do it.
2015-03-06 23:35:04 -05:00
Paul Eggert
e1acc3c7ef Random minor fixes for movemail
* movemail.c: Include <stdbool.h> and <signal.h>.
(waitpid) [WINDOWSNT]: New macro.
(wait) [WINDOWSNT]: Remove.
(main, popmail, pop_retr, mbx_write, mbx_delimit_begin)
(mbx_delimit_end): Use bool for boolean.
(main): Simplify #if usage a bit.
(main): Don't assume EOF == -1.  Prefer 'return' to 'exit'.  Don't
possibly unlink lockname twice, as that's a race condition.  Set
SIGCHLD to SIG_DFL to work around SysV misfeature.  Check for fork
failure.  Use waitpid, not wait, to avoid a race condition in the
unlikely case where we start up with a child.
(NOTOK, OK): Remove, in favor of plain boolean.
(popmail, pop_retr): Don't get confused about errno, e.g., ferror
need not set errno.
(popmail): Use fclose (mbf), not close (fileno (mbf)), to also
detect any stream-related errors (e.g., memory exhaustion).
(pop_retr): Report pop errors separately, since caller now does
errno reporting.
(mbx_write, mbx_delimit_begin, mbx_delimit_end): Check < 0, not ==
EOF, as it's a bit faster and (in theory) pickier.
2015-03-06 15:41:45 -08:00
Oscar Fuentes
20c6b227ea browse-url-firefox: removed MS-Windows limitations
net/browse-url.el (browse-url-firefox): Removed outdated
MS-Windows limitations.
2015-03-06 17:18:45 +01:00
Thomas Fitzsimmons
bfebebbc72 Fix EUDC LDAP duplicate mail handling
Fixes: debbugs:17720

* net/eudcb-ldap.el (eudc-ldap-cleanup-record-simple): Mark as
obsolete.
(eudc-ldap-cleanup-record-filtering-addresses): Add docstring.
Don't clean up postal addresses if ldap-ignore-attribute-codings
is set.  Combine mail addresses into one field. (Bug#17720)
(eudc-ldap-simple-query-internal): Call
eudc-ldap-cleanup-record-filtering-addresses instead of
eudc-ldap-cleanup-record-simple.
(eudc-ldap-get-field-list): Likewise.
2015-03-05 21:54:27 -05:00
Ivan Shmakov
b08f8bb06a Render application/xhtml+xml as HTML
Fixes: debbugs:20009

* lisp/net/eww.el (eww-html-p): New function.
(eww-render): Use it.
2015-03-05 23:26:34 +01:00
Paul Eggert
cbc9d8d426 Work around x86 glibc backtrace bug
* sysdep.c (emacs_backtrace): Don't dump core on x86.
Fixes: bug#19959
2015-03-05 11:59:31 -08:00
Eli Zaretskii
1be3bd0ad8 Fix region extension when scroll bar is on the right
src/keyboard.c (make_lispy_position): When the click is on the
 right-side vertical scroll bar, pass the rightmost X coordinate to
 buffer_posn_from_coords, so that the returned text position
 reflects the closest point to the click.  Fixes region extension
 when mouse moves outside the Emacs frame that has scroll bars on
 the right.
2015-03-05 18:56:43 +02:00
Artur Malabarba
61e06b6cb2 desktop.el (desktop-buffer-info): Use `pushnew'. 2015-03-05 13:43:27 +00:00
Artur Malabarba
6065fbe0d2 desktop.el (desktop-buffer-info): Write docstring. 2015-03-05 13:37:23 +00:00
Artur Malabarba
17ecfea3b9 package.el (package-refresh-contents): Update doc. 2015-03-05 13:25:53 +00:00
Dmitry Gutov
77ab7f8455 Teach js-mode about ES6 template strings
* lisp/progmodes/js.el (js-mode-syntax-table): Add an entry for `.
2015-03-05 04:33:36 +02:00
Stefan Monnier
21c547863d Replace *-function vars with generic functions in cl-generic.
* lisp/emacs-lisp/cl-generic.el (cl--generic-generalizer): New struct.
(cl-generic-tagcode-function, cl-generic-tag-types-function): Remove.
(cl--generic-t-generalizer): New const.
(cl--generic-make-method): Rename from `cl--generic-method-make'.
(cl--generic-make): Change calling convention.
(cl--generic): Add `options' field.
(cl-generic-function-options): New function.
(cl-defgeneric): Rewrite handling of options.  Add support for :method
options and allow the use of a default body.
(cl-generic-define): Save options in the corresponding new field.
(cl-defmethod): Fix ordering of qualifiers.
(cl-generic-define-method): Use cl-generic-generalizers.
(cl--generic-get-dispatcher): Change calling convention, and change
calling convention of the returned function as well so as to take the
list of methods separately from the generic function object, so that it
can receive the original generic function object.
(cl--generic-make-next-function): New function, extracted from
cl--generic-make-function.
(cl--generic-make-function): Use it.
(cl-generic-method-combination-function): Remove.
(cl--generic-cyclic-definition): New error.
(cl-generic-call-method): Take a generic function object rather than
its name.
(cl-method-qualifiers): New alias.
(cl--generic-build-combined-method): Use cl-generic-combine-methods,
don't segregate by qualifiers here any more.
(cl--generic-standard-method-combination): Segregate by qualifiers
here instead.  Add support for the `:extra' qualifier.
(cl--generic-cache-miss): Move earlier, adjust to new calling convention.
(cl-generic-generalizers, cl-generic-combine-methods):
New generic functions.
(cl-no-next-method, cl-no-applicable-method, cl-no-primary-method):
Use the new "default method in defgeneric" functionality, change
calling convention to receive a generic function object.
(cl--generic-head-used): New var.
(cl--generic-head-generalizer, cl--generic-eql-generalizer)
(cl--generic-struct-generalizer, cl--generic-typeof-generalizer):
New consts.
* lisp/emacs-lisp/eieio-core.el (eieio--generic-generalizer)
(eieio--generic-subclass-generalizer): New consts.
(cl-generic-generalizers): New methods.
* lisp/emacs-lisp/eieio-compat.el (eieio--generic-static-symbol-generalizer)
(eieio--generic-static-object-generalizer): New consts.
(cl-generic-generalizers) <(head eieio--static)>: New method.
* lisp/emacs-lisp/byte-opt.el (byte-optimize-form-code-walker):
Unfold closures like lambdas.
2015-03-04 20:04:57 -05:00
Eli Zaretskii
9f1f6c8b56 src/ChangeLog: Fix bad formatting. 2015-03-04 19:57:38 +02:00
Martin Rudalics
53a3f3ab17 Handle tool bar size changes after x_set_font.
* frame.c (x_set_font): Try to keep frame height and width
unchanged if tool bar size changes with new font.
2015-03-04 18:52:08 +01:00
Glenn Morris
69204d5a8a # Changelog fixes (no need to merge to trunk) 2015-03-04 09:04:54 -08:00
Glenn Morris
0ec2600a49 # Changelog fixes 2015-03-04 09:02:44 -08:00
Filipp Gunbin
5599661ead * autorevert.el (auto-revert-notify-add-watch): fix handler installation
Fixes: bug#20000
2015-03-04 19:39:24 +03:00
Rüdiger Sonderfeld
6c0a602fb8 eww: Fix some docstrings/error message.
* net/eww.el (eww-search-prefix, eww-open-file, eww-search-words)
(eww-same-page-p,eww-set-character-encoding): Fix docstring.
(eww): Do not end error messages with a period.
2015-03-04 12:38:22 +01:00
Michael Albinus
b209a4bf1b Sync with Tramp upstream
* tramp.texi (External methods) <adb>: Explain, when Tramp
connects to devices.  Mention port numbers.
(GVFS based methods, File name completion): Add index.
(Multi-hops, Remote Programs, File name completion, Ad-hoc multi-hops):
Improve wording.

* trampver.texi: Update release number.
2015-03-04 12:35:36 +01:00
Michael Albinus
44a7c1f93a Sync with Tramp upstream
* automated/tramp-tests.el (top): Declare `tramp-get-remote-stat'
and `tramp-get-remote-perl'.
(tramp-test06-directory-file-name): Fix docstring and last test.
(tramp-test08-file-local-copy): Extend test.
(tramp-test13-make-directory): Test also PARENTS arg.
(tramp-test17-insert-directory): Do not expect any order in
directory listing.
(tramp--test-adb-p): New defun.
(tramp--test-check-files): Fix doxstring.  Extend tests.
(tramp--test-special-characters): New defun.  Use body from
`tramp-test30-special-characters'.  Adapt check for tramp-adb.el.
(tramp-test30-special-characters): Use it.
(tramp--test-utf8): New defun.  Use body from
`tramp-test31-utf8'.  Add test string.
(tramp-test31-utf8): Use it.
(tramp-test30-special-characters-with-stat)
(tramp-test30-special-characters-with-perl)
(tramp-test30-special-characters-with-ls):
(tramp-test31-utf8-with-stat, tramp-test31-utf8-with-perl)
(tramp-test31-utf8-with-ls): New tests.
2015-03-04 11:46:06 +01:00
Zhongwei Yao
b9d09d80d2 Support port numbers in tramp-adb
* net/tramp-adb.el (tramp-adb-connect-if-not-connected):
New user option.
(tramp-adb-ls-toolbox-regexp): Fix regexp in order to support file
names starting with a space.
(tramp-methods): Add `tramp-default-port' for "adb".
(tramp-adb-parse-device-names): Add traces.  Return device names
with port, if present.
(tramp-adb-handle-directory-files-and-attributes): Quote all
remote file names.
(tramp-adb-get-device): New defun.
(tramp-adb-execute-adb-command, tramp-adb-maybe-open-connection):
Use it.
(tramp-adb-maybe-open-connection): Set `tramp-current-*'
variables.  Remove checks for listed devices.
2015-03-04 11:13:19 +01:00
Michael Albinus
8ac08792a7 Sync with Tramp upstream.
* net/tramp-cache.el (tramp-dump-connection-properties):
Use `with-temp-file'.

* net/tramp-sh.el (tramp-perl-file-attributes)
(tramp-perl-directory-files-and-attributes): Escape apostrophs in
file names.
(tramp-do-file-attributes-with-stat): Quote file name.
(tramp-sh-handle-directory-files-and-attributes): Fall back to
`tramp-handle-directory-files-and-attributes' in case of problems.
(tramp-do-directory-files-and-attributes-with-stat)
(tramp-sh-handle-file-name-all-completions)
(tramp-sh-handle-delete-directory)
(tramp-sh-handle-expand-file-name, tramp-sh-handle-process-file):
Normalize use of "cd".
(tramp-do-directory-files-and-attributes-with-stat): Use the
`quoting-style' arg of `ls' if possible.  Make it also working for
file names with apostrophs.
(tramp-sh-handle-file-name-all-completions): Use arguments of `ls'
in proper order.
(tramp-do-copy-or-rename-file-via-buffer)
(tramp-sh-handle-file-local-copy): Use `with-temp-file'.
(tramp-get-remote-locale): Accept also \r in output.
(tramp-get-ls-command-with-quoting-style): New defun.
(tramp-get-inline-coding): Set `default-directory' to a local
directory.  Sporadically, `call-process-region' does not handle a
remote default directory properly.

* net/tramp.el (tramp): Add :link property.
(tramp-login-prompt-regexp): Allow also "user", as required by
Fritz!Box telnet.
(tramp-autoload-file-name-handler): Use "/".
(tramp-handle-unhandled-file-name-directory): Return nil when
required by the spec.

* net/trampver.el: Update release number.
2015-03-04 11:02:36 +01:00
Paul Eggert
5d9b1e100a Spelling fixes 2015-03-03 15:10:40 -08:00
Paul Eggert
98284ef51c Merge from origin/emacs-24
c4ade11 textmodes/ispell.el: Look for aspell .dat files also under dict-dir
e28ec9a ispell.el: Extend to aspell current hunspell handling of aliases

Conflicts:
	lisp/ChangeLog
2015-03-03 14:52:04 -08:00
Paul Eggert
518eab2f7d Merge from origin/emacs-24
The following commit was skipped:

15d78a2 # Auto-commit of loaddefs files.
2015-03-03 14:41:54 -08:00
Paul Eggert
37ad855a38 Merge from origin/emacs-24
f160106 Avoid assertion violations in Rmail due to newline cache
1b0ebbd browse-url-firefox: update for firefox 36's removal of -remote
1817892 Avoid erratic behavior of menu-bar tooltips on w32  (Bug#19925)
0260932 Bump python.el version
b0adfc7 Spelling fixes
35f047c * src/fileio.c (Fmake_temp_name): Doc tweaks.
6f2971a * lisp/comint.el (comint-line-beginning-position): Revert searching
65d8ac7 Mention in admin/notes/repo how to mark commits not to be merged.
86fe750 # Remove NEWS temporary markup
4fa778b erc.el: Add old version header for package.el compatibilty
9366f05 Tramp: Disable paging with PAGER=cat

Conflicts:
	admin/notes/repo
	etc/NEWS
	lisp/ChangeLog
	lisp/erc/ChangeLog
	src/ChangeLog
2015-03-03 14:41:30 -08:00