* lisp/emacs-lisp/cl-macs.el (cl--transform-lambda): Optimize &aux.

Rework to avoid cl--do-arglist in more cases; add comments to explain what's
going on.
(cl--do-&aux): New function extracted from cl--do-arglist.
(cl--do-arglist): Use it.
* lisp/emacs-lisp/cl-generic.el: Add Version: header, for ELPA purposes.

Add `predicate' arg to `read-buffer' and use it for erc-iswitchb

Fixes: debbugs:20116
* src/minibuf.c (Fread_buffer): Add `predicate' argument.
* src/callint.c (Fcall_interactively): Adjust calls accordingly.

* lisp/erc/erc.el (erc-switch-to-buffer): Rename from erc-iswitchb and rewrite
using read-buffer.
(erc--buffer-p): New function, extracted from erc-buffer-filter.
(erc-buffer-filter): Use it.
(erc-with-all-buffers-of-server): Silence compile warning if the return
value is unused.
(erc-is-valid-nick-p, erc-common-server-suffixes, erc-get-arglist)
(erc-command-name, erc-popup-input-buffer): Use \` and \' to match
beg/end of string.

* lisp/obsolete/iswitchb.el (iswitchb-read-buffer): Add `predicate' arg.
* lisp/isearchb.el (isearchb-iswitchb): Adjust accordingly.
* lisp/ido.el (ido-read-buffer): Add `predicate' argument.
* lisp/misearch.el (unload-function-defs-list): Declare before use.

Fixes: debbugs:19335
* net/browse-url.el (browse-url-browser-function): Add "Conkeror".
(browse-url-conkeror-program, browse-url-conkeror-arguments)
(browse-url-conkeror-new-window-is-buffer): New defcustoms.
(browse-url-default-browser): Check for `browse-url-conkeror'
and call `browse-url-conkeror-program'.
(browse-url-conkeror): New command.
(bug#19863)

* etc/NEWS: Mention added support for Conkeror.

Add 'clear' functionality to eshell.

* eshell/esh-mode.el (eshell/clear): New function.

* etc/NEWS: Mention new built-in command.

Make Edebug work with Follow Mode.

* emacs-lisp/edebug.el (edebug--display-1): Remove call to
edebug-adjust-window.
(edebug--recursive-edit): Don't bind pre/post-command-hooks to nil
over the recursive edit.
(edebug-adjust-window): Remove.

(url-insert-file-contents): Set buffer-file-coding-system

Fixes: debbugs:20010
* lisp/url/url-handlers.el (url-insert-file-contents): Call
after-insert-file-set-coding like insert-file-contents, to set
buffer-file-coding-system.

Fix subtle problems with linum-mode and invisible text

 src/xdisp.c (handle_invisible_prop): Fix up it->position even when
 we are going to load overlays at the beginning of the invisible
 text.
 (setup_for_ellipsis): Reset the ignore_overlay_strings_at_pos_p
 flag also here.
 (next_overlay_string): Set the overlay_strings_at_end_processed_p
 flag only if the overlays just processed were actually loaded at
 EOB.

In Tramp. check ssh Control* options only when needed

Fixes: debbugs:20015
* net/tramp-adb.el:
* net/tramp-gvfs.el:
* net/tramp-sh.el:
* net/tramp-smb.el: Set tramp-autoload cookie for all defcustoms.

* net/tramp-sh.el (tramp-use-ssh-controlmaster-options):
New defcustom, moved from tramp.el.
(tramp-ssh-controlmaster-options): New defvar, moved from tramp.el
but with a nil initial value.
(tramp-ssh-controlmaster-options): New defun.
(tramp-do-copy-or-rename-file-out-of-band)
(tramp-maybe-open-connection): Use it.

* net/tramp.el (tramp-ssh-controlmaster-options)
(tramp-use-ssh-controlmaster-options): Move them to tramp-sh.el.
(tramp-default-method): Do not check for
`tramp-ssh-controlmaster-options'.

Font-lock elisp macros/special forms dynamically

* emacs-lisp/lisp-mode.el (lisp--el-macro-regexp): New defconst.
(lisp--el-update-macro-regexp, lisp--el-update-after-load)
(lisp--el-match-macro): New functions.
(lisp-mode-variables): Update lisp--el-macro-regexp and add
lisp--el-update-after-load to after-load-functions.

Support indenting backquote substitutions in cl-indent

* lisp/emacs-lisp/cl-indent.el
(lisp-indent-backquote-substitution-mode): New user option.
(common-lisp-indent-function-1, common-lisp-loop-part-indentation)
(common-lisp-indent-function): Support normally indenting
backquote substitutions.
(extended-loop-p): Rename to `lisp-extended-loop-p'.

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

2015-03-14  Michael R. Mauger  <michael@mauger.com>

* progmodes/sql.el: Version 3.5
(sql-starts-with-prompt-re, sql-ends-with-prompt-re): Match password prompts.
(sql-interactive-remove-continuation-prompt): Fixed regression. (Bug#6686)

Type checking for `define-widget'

* lisp/widget.el (define-widget): Check that documentation is a string
or nil; prevent wailing and gnashing of teeth when users forget to
pass a docstring and wonder why their properties don't work.

Add --no-x-resources option

* lisp/startup.el (command-line): Process "--no-x-resources".

* src/emacs.c (standard_args): Add --no-x-resources.
(usage_message): Document that -Q implies --no-x-resources.

Mention Bug 19482 on 2015-01-06 change.

Fix ChangeLog typo

info-look fixes for Texinfo 5

* info-look.el (c-mode, bison-mode, makefile-mode)
(makefile-automake-mode, texinfo-mode, autoconf-mode, awk-mode)
(latex-mode, emacs-lisp-mode, sh-mode, cfengine-mode): Match
`foo' and 'foo' and ‘foo’ for @item and similar.
(latex-mode): Match multi-arg \frac{num}{den} or \sqrt[root]{n} in
suffix regexp.

* frame.c (x_get_resource_string) [!USE_GTK]: Don't define.

* editfns.c, systime.h (mktime_z) [!HAVE_TZALLOC]: Now static.

Support goal column in multi-line minibuffer

* lisp/simple.el (next-line-or-history-element)
(previous-line-or-history-element): Remember the goal column of
possibly multi-line input, and restore it afterwards.

Fixes: debbugs:19824

Fixes: debbugs:19335
* lisp/ido.el (ido-add-virtual-buffers-to-list): Include bookmark-alist files

Fix support of scripts in w32font.c  (Bug#19993)

 src/w32font.c (font_supported_scripts): Add subranges for Latin
 Supplement, Latin Extended-A/B, Vai, Supplemental Punctuation, Tai
 Le, Buginese, Yijing Hexagrams, Ancient Greek Numbers, Tai Xuan
 Jing, Counting Rods, Sundanese, Lepcha, Ol Chiki, Saurashtra,
 Kayah Li, Rejang, Ancient Symbols, Phistos Disc, Carian, Lycian,
 Lydian, Dominoe Tiles, and Mahjong Tiles.  Break the Mathematical
 Alphanumeric Symbols into several "scripts" like fontset.el does.
 (syms_of_w32font): DEFSYM all the new script symbols.

 lisp/international/fontset.el (script-representative-chars): Add a
 representative character for 'vai'.

* international/quail.el (quail-input-method): Use with-silent-modifications

* lisp/gnus/registry.el (registry-db): Don't oset-default an instance slot.

* lisp/gnus/gnus-registry.el (gnus-registry-handle-action)
(gnus-registry-post-process-groups): Don't add-to-list on a local var.
(gnus-registry-keywords): Make it do something.
(gnus-registry-import-eld): Remove unused var `new-entry'.
(gnus-registry-action): Remove unused var `to-name'.
(gnus-registry-make-db): Prefer `make-instance' to avoid
compiler warnings.
(gnus-registry-load, gnus-registry-fixup-registry): Avoid `oset'.

* lisp/simple.el (goto-history-element): Don't burp on t history.

* indent/js-indent-init-dynamic.js: Fix spelling error.

Prefer "initialize" to "initialise"

* lisp/progmodes/js.el (js-indent-first-init):
Rename from js-indent-first-initialiser, to avoid worrying about
American vs British spelling.  All uses changed.
* test/indent/js-indent-init-t.js: Rename from
indent/js-indent-first-initialiser-t.js.
* test/indent/js-indent-init-dynamic.js: Rename from
test/indent/js-indent-first-initialiser-dynamic.js.

# Further ChangeLog fix

* lisp/progmodes/js.el (js-indent-first-initialiser): Fix doc, type, version.
First line of the doc string should be a complete sentence.

* etc/NEWS: Mention new option.

# Fix associated ChangeLog entries.

* lisp/gnus/message.el (message-valid-fqdn-regexp): Bump :version

New indentation option for js-mode

* lisp/progmodes/js.el (js--proper-indentation): Add new custom option
`js-indent-first-initialiser' and a function to utilize it,
`js--maybe-goto-declaration-keyword-end'.

* test/indent/js.js: Add local variables.

* test/indent/js-indent-first-initialiser-t.js: New test for
`js-indent-first-initialiser'.

* test/indent/js-indent-first-initialiser-dynamic.js: New test for
`js-indent-first-initialiser'.

Spelling and minor grammar fixes

* test/automated/cl-lib-tests.el: Add tests for plusp, second, ...

(cl-lib-test-plusp, cl-lib-test-minusp)
(cl-lib-test-oddp, cl-lib-test-evenp, cl-lib-test-first)
(cl-lib-test-second, cl-lib-test-third, cl-lib-test-fourth)
(cl-lib-test-fifth, cl-lib-test-sixth, cl-lib-test-seventh)
(cl-lib-test-eighth, cl-lib-test-ninth, cl-lib-test-tenth)
(cl-lib-test-endp, cl-lib-test-nth-value)
(cl-lib-nth-value-test-multiple-values, cl-test-caaar, cl-test-caadr)
(cl-test-ldiff): New tests.
(cl-digit-char-p): Tighten the test.

Recognize more LDAP attributes

Fixes: debbugs:8983
* net/ldap.el (ldap-attribute-syntaxes-alist): Add LDAP attributes
from RFC2798 Section 9.1.1.  (Bug#8983)

Automate 'make all' in test/indent

nt/ChangeLog: Fix typos.

Add seq-into as a public function

* lisp/emacs-lisp/seq.el: Make seq-into a public function (replacing
seq--into)
* test/automated/seq-tests.el: Add tests for seq-into
* doc/lispref/sequences.texi: Add documentation for seq-into

ruby-mode: Detect regexps after `!'

Fixes: debbugs:19285
* lisp/progmodes/ruby-mode.el (ruby-syntax-before-regexp-re): Detect
regexps after `!'.

ruby-mode: Don't consider `=' a part of symbol when followed by `>'

Fixes: debbugs:18644
* lisp/progmodes/ruby-mode.el (ruby-font-lock-keywords): Don't consider
`=' a part of symbol when followed by `>'.

Fix ChangeLog typos

Merge from origin/emacs-24

The following commit was skipped:

b21a56a Bump version to 24.4.91

Merge from origin/emacs-24

113fcc3 * etc/AUTHORS: Update the AUTHORS file
51c0c8d * lisp/ChangeLog: Fix a changelog entry

Conflicts:
etc/AUTHORS

Merge from origin/emacs-24

The following commit was skipped:

9869d6f Make tramp-ssh-controlmaster-options a defcustom.  Do not merge with master.

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

Merge from origin/emacs-24

The following commit was skipped:

69204d5 # Changelog fixes (no need to merge to trunk)

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.

lisp/gnus/gnus-notifications.el (gnus-notifications-action): Replace x-focus-frame kludge by calling gnus-select-frame-set-input-focus

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.

Add an indent test example for bug#20026

* test/indent/ruby.rb: Add an example for bug#20026.

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.

Fix test/indent/js.js

* test/indent/js.js: Set `js-indent-level' to 2. Fix indentation in an
example.

Bump version to 24.4.91

* etc/AUTHORS: Update the AUTHORS file

* lisp/ChangeLog: Fix a changelog entry

# Auto-commit of loaddefs files.

lisp/gnus/gnus-notifications: Raise frame when clicking Read; Add mark as read

lisp/gnus/message.el (message-insert-formatted-citation-line): Change %F to fall back to email address if no first name could be determined

Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Make tramp-ssh-controlmaster-options a defcustom.  Do not merge with 

Fixes: debbugs:20015
* net/tramp.el (tramp-ssh-controlmaster-options): Make it a
defcustom.

Revert "Make tramp-ssh-controlmaster-options a defcustom.  Do not merge with "

This reverts commit 5ab767b8dcea50b4d02c3910d19c223a5402f99d.

Make tramp-ssh-controlmaster-options a defcustom.  Do not merge with 

Fixes: debbugs:20015
* net/tramp.el (tramp-ssh-controlmaster-options): Make it a defcustom.

Improve MS-Windows build instructions  (Bug#19989)

 nt/INSTALL: Add some more installation instructions for mingw-get
 users.

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.

lisp/dired.el (dired-delete-file): Doc fix.  (Bug#20021)

* 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'.

* 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.

* 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.

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.

browse-url-firefox: removed MS-Windows limitations

net/browse-url.el (browse-url-firefox): Removed outdated
MS-Windows limitations.

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.

Render application/xhtml+xml as HTML

Fixes: debbugs:20009
* lisp/net/eww.el (eww-html-p): New function.
(eww-render): Use it.

Work around x86 glibc backtrace bug

* sysdep.c (emacs_backtrace): Don't dump core on x86.
Fixes: bug#19959

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.

desktop.el (desktop-buffer-info): Use `pushnew'.

desktop.el (desktop-buffer-info): Write docstring.

package.el (package-refresh-contents): Update doc.

Teach js-mode about ES6 template strings

* lisp/progmodes/js.el (js-mode-syntax-table): Add an entry for `.

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.

src/ChangeLog: Fix bad formatting.

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.

# Changelog fixes (no need to merge to trunk)

# Changelog fixes

* autorevert.el (auto-revert-notify-add-watch): fix handler installation

Fixes: bug#20000

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.

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.

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.

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.

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.

Spelling fixes

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

Merge from origin/emacs-24

The following commit was skipped:

15d78a2 # Auto-commit of loaddefs files.

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

Merge from origin/emacs-24

The following commit was skipped:

432b00e Fix assertions in popping up menus on TTY  (Bug#19862)

Merge from origin/emacs-24

0077b36 # NEWS copyedits
3ca2ff3 * lisp/erc/erc.el (erc-rename-buffers): Doc fix.  Add :version.
b85523f * lisp/textmodes/flyspell.el (flyspell-duplicate-distance):
decb48d Augment text-mode syntax table for a few special characters
8b3ba7a Improve docs of transient-mark-mode  (Bug#19841)
72fd047 NEWS: Add section to include ERC changes
a7254bb Improve string search in `flyspell-word-search-*`. (Bug#16800)

Conflicts:
etc/ChangeLog
etc/NEWS
lisp/ChangeLog
lisp/erc/ChangeLog
src/ChangeLog

Merge from origin/emacs-24

The following commits were skipped:

f5d1e1f Backport NEWS typo fix
680ee61 Backport fix for bug#18745 from master.

Merge from origin/emacs-24

4b0b27d Fix invocation of commands whose file name includes extension
87fc99f Better support for the case of typing RET on the prompt in comint.
a7b1c2f Don't lose frame's background color when setting foreground
20c817d Fix handling of frame color parameters in TTY sessions
eca7da1 Complete the remaining documentation updates for 24.5

Conflicts:
doc/lispref/ChangeLog
etc/NEWS
lisp/ChangeLog
nt/ChangeLog
src/ChangeLog

Merge from origin/emacs-24

The following commit was skipped:

4f5033f Backport the :end-of-capability fix

Merge from origin/emacs-24

c0ba590 Fix vertical-motion and posn-at-point when word-wrap is
a323b93 Better multi-line input support in comint.el
008a04a todo-mode.el: Restore point on setting item done  (Bug#19727)
9615c0d doc/misc/erc.texi: fix typo
c648717 Update ERC docs and update MAINTANERS to include myself
d825f66 Fix filling circle/ellipse in Artist Mode  (Bug#19763)

Conflicts:
admin/ChangeLog
doc/misc/ChangeLog
doc/misc/erc.texi
lisp/ChangeLog
src/ChangeLog

Merge from origin/emacs-24

The following commit was skipped:

4779a4b Bump version to 24.4.90

Merge from origin/emacs-24

ec26c23 authors.el: Add missing ignored and renamed files
e589765 A more thorough fix for bug#19307
4e8d586 Fix last commit
d6fee01 Tramp: Don't use a tempfile for ControlPath.
27e11c0 Fix display of overlay strings with faces after ellipsis  (Bug#19307)
e9a7e10 Fix redrawing of mode lines when exposed  (Bug#19721)
50f3811 net/tramp.el (tramp-ssh-controlmaster-options): Use "%C"

Conflicts:
lisp/ChangeLog
src/ChangeLog
src/xdisp.c