* progmodes/octave.el (inferior-octave-startup-hook): Obsolete.
(inferior-octave-startup): Remove inferior-octave-startup-hook.
(octave-function-file-comment): Fix typo.
(octave-sync-function-file-names): Use read-char-choice.

Fix bug #14287 with decoding EOL by *-dos coding systems.

 src/coding.c (decode_coding_gap): Don't remove the character before
 a newline unless it's a CR character.

* calc/calc.el (math-normalize): Don't set `math-normalize-error' to t
for the less important warnings.

* dispextern.h (struct face): Move enum face_underline_type
earlier so that bitfields can be in the same word.

* nsfns.m (handlePanelKeys): New function.
(EmacsOpenPanel:performKeyEquivalent:)
(EmacsSavePanel:performKeyEquivalent:): Call handlePanelKeys to handle
arrows/function/control and copy/paste keys.

Fixes: debbugs:14296

lisp/gnus/sieve-manage.el (sieve-manage-authenticator-alist): Update the sieve port to "sieve" now that it has an official IANA port assigned

* lisp/isearch.el (isearch-fail-pos): Check for empty `cmds'.

Fixes: debbugs:14268

* lisp/cedet/semantic/complete.el
  (semantic-collector-calculate-completions-raw): If `completionslist'
  is not set, refresh the cache if necessary and use it for
  completions.  This fixes the `semantic-collector-buffer-deep'
  collector (bug#14265).

* gnus/gnus.el (gnus-list-debbugs): Use require rather than autoload.

Fixes: debbugs:14262

* vc/log-view.el (log-view-current-entry):
Treat "---" separator lines as part of the following rev.

Fixes: debbugs:14169

* src/callint.c (Fcall_interactively): Call `Qread_number' for
interactive code letter `n' instead of using duplicate code.

* lisp/subr.el (read-number): Doc fix about using it by interactive
code letter `n'.

Fixes: debbugs:14254

* lisp/desktop.el (desktop-auto-save-timeout): New option.
(desktop-file-checksum): New variable.
(desktop-save): Add optional arg `auto-save' and don't auto-save
if nothing changed.
(desktop-auto-save-timer): New variable.
(desktop-auto-save, desktop-auto-save-set-timer): New functions.
(after-init-hook): Call `desktop-auto-save-set-timer'.
Suggested by Reuben Thomas <rrt@sc3d.org> in
<http://lists.gnu.org/archive/html/emacs-devel/2013-04/msg00327.html>.

Merge from gnulib.

* files.el (basic-save-buffer): Don't let errors in
before-save-hook prevent saving buffer.

* progmodes/octave.el (octave-function-file-p)
(octave-skip-comment-forward, octave-function-file-comment)
(octave-update-function-file-comment): New functions.
(octave-mode-map): Bind C-c ; to
octave-update-function-file-comment.
(octave-mode-menu): Add octave-update-function-file-comment.
(octave-mode, inferior-octave-mode): Fix doc-string.
(octave-insert-defun): Conform to Octave's coding convention.

Fixes: debbugs:14285

read-face-name: Use completing-read if arg multiple is nil

Fix Dired when ls-lisp is used and the -a switch is not used.

 lisp/ls-lisp.el (ls-lisp-insert-directory): If no files are
 displayed, move point to after the totals line.  See
 http://lists.gnu.org/archive/html/emacs-devel/2013-04/msg00677.html
 for the details.

* systime.h (make_timeval): Declare as 'const'.

merge trunk

merge trunk

* lisp/emacs-lisp/package.el (package-autoload-ensure-default-file):
Add current dir to the load-path.
(package-generate-autoloads): Don't rely on autoload-ensure-default-file.

font.c (font_open_entity): Always open a font of manageable size.

Auto-commit of generated files.

lisp/ChangeLog: Tiny ChangeLog formatting fix.

Fix docstring buglet in remember.el

Port better to AIX.

* configure.ac (CFLAGS): Append -O if the user did not specify CFLAGS,
we did not already infer an optimization option, and -O works.
AIX xlc needs -O, otherwise garbage collection doesn't work.
* src/lisp.h (ENUM_BF) [__IBMC__]: Make it 'unsigned int' here, too,
to pacify AIX xlc.

Fixes: debbugs:14258

* progmodes/octave.el (octave-sync-function-file-names): Fix last
  change.

* progmodes/octave.el (octave-sync-function-file-names): New function.
(octave-mode): Use it in before-save-hook.

* lisp/emacs-lisp/tabulated-list.el (tabulated-list-mode): Disable undo.

Fixes: debbugs:14274

* lisp/progmodes/octave.el (octave-smie-forward-token): Properly skip
\n and comment, even if it's not an implicit ;.

Fixes: debbugs:14218

lisp/gnus/mail-source.el (mail-source-fetch-pop, mail-source-check-pop): Fix again

lisp/gnus/mail-source.el (mail-source-fetch-pop, mail-source-check-pop): Fix last change

lisp/gnus/mail-source.el (mail-source-fetch-pop, mail-source-check-pop): Don't set the MAILHOST environment variable permanently (Bug#14271)

* lisp/gnus/message.el (message-bury): Revert 2013-03-18 change.

Fixes: debbugs:14117

Merge from emacs-24; up to 2012-12-27T08:21:08Z!rgm@gnu.org

Add missing reftex-label-ignored-macros-and-environments :version tag

list-load-path-shadows simplification

* lisp/emacs-lisp/shadow.el (list-load-path-shadows):
No longer necessary to check for duplicate simple.el, since
2012-07-07 change to init_lread to not include installation lisp
directories in load-path when running uninstalled.

Fixes: debbugs:14270

* progmodes/octave.el (octave-submit-bug-report): Obsolete.
(octave-mode, inferior-octave-mode): Use setq-local.
(octave-not-in-string-or-comment-p): Renamed to
octave-in-string-or-comment-p.
(octave-in-comment-p, octave-in-string-p)
(octave-in-string-or-comment-p): Replace defsubst with defun.

lisp/gnus/gnus-msg.el (gnus-inews-insert-gcc): Re-order conditional to work for string values of 'gcc-self

* Makefile.in (distclean): Remove $(lisp)/loaddefs.el~.

* textmodes/remember.el (remember-data-directory)
(remember-directory-file-name-format): Fix custom types.

Thanks to Glenn Morris for reporting these problems and for the fixes.

* progmodes/octave.el (octave-completion-at-point-function): Make
use of inferior octave process.
(octave-initialize-completions): Remove.
(inferior-octave-completion-table): New function.
(inferior-octave-completion-at-point): Use it.
(octave-completion-alist): Remove.

* lisp/progmodes/opascal.el: Use font-lock and syntax-propertize.
(opascal-mode-syntax-table): New var.
(opascal-literal-kind, opascal-is-literal-end)
(opascal-literal-token-at): Rewrite.
(opascal--literal-start-re, opascal-font-lock-keywords)
(opascal--syntax-propertize): New constants.
(opascal-font-lock-defaults): Adjust.
(opascal-mode): Use them.  Set comment-<foo> variables as well.
(delphi-comment-face, opascal-comment-face, delphi-string-face)
(opascal-string-face, delphi-keyword-face, opascal-keyword-face)
(delphi-other-face, opascal-other-face): Remove face variables.
(opascal-save-state): Remove macro.
(opascal-fontifying-progress-step): Remove constant.
(opascal--ignore-changes): Remove var.
(opascal-set-token-property, opascal-parse-next-literal)
(opascal-is-stable-literal, opascal-complete-literal)
(opascal-is-literal-start, opascal-face-of)
(opascal-parse-region, opascal-parse-region-until-stable)
(opascal-fontify-region, opascal-after-change)
(opascal-debug-show-is-stable, opascal-debug-unparse-buffer)
(opascal-debug-parse-region, opascal-debug-parse-window)
(opascal-debug-parse-buffer, opascal-debug-fontify-window)
(opascal-debug-fontify-buffer): Remove.
(opascal-debug-mode-map): Adjust accordingly.

Merge octave-mod.el and octave-inf.el into octave.el with some
cleanups.

* progmodes/octave.el: New file renamed from octave-mod.el.
* progmodes/octave-inf.el: Merged into octave.el.
* progmodes/octave-mod.el: Renamed to octave.el.

* textmodes/reftex-vars.el
(reftex-label-ignored-macros-and-environments): New defcustom.

* textmodes/reftex-parse.el (reftex-parse-from-file): Use it.

* lisp/progmodes/octave-mod.el (octave-smie-forward-token): Only emit
semi-colons if the line is not otherwise empty.
* lisp/emacs-lisp/smie.el (smie-indent--hanging-p): Don't burp at EOB.
(smie-indent-keyword): Improve the check to ensure that the next
comment is really on the same line.
(smie-indent-comment): Don't align with a subsequent closer (or eob).

Fixes: debbugs:14218

* lisp/vc/vc-bzr.el (vc-bzr-print-log): Tweak LIMIT = 1 case.

lisp/gnus/nnir.el (nnir-close-group): Make sure we are in the right group

lisp/gnus/gnus-sum.el (gnus-summary-insert-articles): Force dependencies update with newly retrieved headers

Spelling fix.

* lisp/progmodes/opascal.el (opascal-set-token-property): Rename from
opascal-set-text-properties and only set `token'.
(opascal-literal-text-properties): Remove.
(opascal-parse-next-literal, opascal-debug-unparse-buffer):
Adjust callers.

Fixes: debbugs:14134

Fix "make info" in doc/lispintro on MS-Windows.

 doc/lispintro/makefile.w32-in (INFO_OPTS): Add "-I$(emacsdir)" to fix last
 commit.

* subr.el (read-number): Once more use `read'
rather than `string-to-number', to trap non-numeric input.

Fixes: debbugs:14254

* themes/tsdh-dark-theme.el (tsdh-dark): Add ido faces and remove
:box from outline faces.

coding.c (decode_coding_iso_2022): When an invalid escape sequence is encountered, reset the invocation and designation status to the safest one.

* textmodes/remember.el (remember-handler-functions): Add an
option for a new handler `remember-store-in-files'.
(remember-data-directory, remember-directory-file-name-format):
New options.
(remember-store-in-files): New function to store remember notes
as separate files within a directory.

* lisp/progmodes/compile.el (compilation-next-error-function):
Pass "formats" to compilation-find-file.

Fixes: debbugs:11777

* vc/vc-bzr.el (vc-bzr-print-log): Improve START-REVISION with LIMIT != 1.

Fixes: debbugs:14168

vc-hg, vc-svn print-log fixes for start-revision with limit != 1

* vc/vc-hg.el (vc-hg-print-log):
* vc/vc-svn.el (vc-svn-print-log): Fix START-REVISION with LIMIT != 1.

Fixes: debbugs:14168

Doc fixes related to vc-print-log

* vc/vc-bzr.el (vc-bzr-print-log):
* vc/vc-cvs.el (vc-cvs-print-log):
* vc/vc-git.el (vc-git-print-log):
* vc/vc-hg.el (vc-hg-print-log):
* vc/vc-mtn.el (vc-mtn-print-log):
* vc/vc-rcs.el (vc-rcs-print-log):
* vc/vc-sccs.el (vc-sccs-print-log):
* vc/vc-svn.el (vc-svn-print-log):
* vc/vc.el (vc-print-log-internal): Doc fixes.

Remove old comments about making various formats (use Makefile instead)

Minor lispintro tweaks

* doc/lispintro/Makefile.in (emacsdir): New variable..
(MAKEINFO_OPTS, ENVADD): Add $emacsdir.
(srcs): Add emacsver.texi.
(dist): Include emacsver.texi.  Edit emacsdir.

* doc/lispintro/emacs-lisp-intro.texi (emacsver.texi): Include it.
(copying): For non-printed versions, uses Emacs version rather
than that of the printed book.
(Complications, Lisp macro, defvar and asterisk, defcustom): Copyedits.

* doc/lispintro/makefile.w32-in (emacsdir): New variable.
(INFO_SOURCES): Add emacsver.texi.
(ENVADD): Add $emacsdir (and $texinfodir).

Doc fix for emacs-lisp-intro.texi.

* doc/lispintro/emacs-lisp-intro.texi (Writing Defuns, Prevent confusion,
  Determining the Element, lambda): Refine the doc about Lisp macros,
  reported by Glenn Morris.

Remove some code duplication in startup.el

"If keys have their default meanings, use precomputed string to save
lots of time" implies substitute-command-keys was slow 20+ years ago
when this was originally written.  But we were accidentally using the
"slow" branch for 5 years and no-one complained about speed (bug#13970).

* lisp/startup.el (normal-no-mouse-startup-screen, normal-about-screen):
Remove venerable code attempting to avoid substitute-command-keys.

* doc/lispref/internals.texi (Writing Emacs Primitives): Remove obvious example.
Tweak other to avoid overly long line.

Fix recursive load issue with reftex.el and reftex-vars.el.

* textmodes/reftex.el (reftex-compile-variables): Add autoload
cookie.

* textmodes/reftex-vars.el (reftex-label-regexps): Call
`reftex-compile-variables' after changes to this variable.

* lisp/jit-lock.el: Fix signals in jit-lock-force-redisplay.
Use lexical-binding.
(jit-lock-force-redisplay): Use markers, check buffer's continued
existence and beware narrowed buffers.
(jit-lock-fontify-now): Adjust call accordingly.

* lisp/minibuffer.el (minibuffer-completion-contents): Fix obsolescence info
to avoid misleading the user.

emacs-lisp-intro.texi fixes.

* doc/lispintro/emacs-lisp-intro.texi (Complications, defvar): Refine the doc about Lisp macros. (http://lists.gnu.org/archive/html/emacs-devel/2013-04/msg00618.html)

* info-look.el: Prefer latex2e.info.

Fixes: debbugs:14240

* lisp/emacs-lisp/syntax.el (syntax-propertize-multiline):
Use `syntax-multiline' text property consistently instead of
`font-lock-multiline'..

Fixes: debbugs:14237

* net/tramp-compat.el (tramp-compat-call-process): Move function ...
* net/tramp.el (tramp-call-process): ... here
(tramp-set-completion-function, tramp-parse-putty):
* net/tramp-adb.el (tramp-adb-execute-adb-command):
* net/tramp-gvfs.el (tramp-gvfs-send-command):
* net/tramp-sh.el (tramp-sh-handle-set-file-times)
(tramp-set-file-uid-gid, tramp-sh-handle-write-region)
(tramp-call-local-coding-command): Use `tramp-call-process'
instead of `tramp-compat-call-process'.

* net/tramp-sh.el (tramp-perl-pack, tramp-perl-unpack): New defconst.
(tramp-local-coding-commands, tramp-remote-coding-commands): Use them.
(tramp-sh-handle-file-local-copy, tramp-sh-handle-write-region):
(tramp-find-inline-compress):Improve traces.
(tramp-maybe-send-script): Check for Perl binary.
(tramp-get-inline-coding): Do not redirect STDOUT for local decoding.

* Makefile.in (bootstrap-clean): Remove stamp-h1 too.

Without this fix, "make distclean" leaves stamp-h1 behind.

* make-dist: Do not distribute admin/unidata/Makefile.

It is generated by 'configure'.

* build-aux/update-subdirs: Don't leave subdirs.el~ behind.

It messes up 'make distclean', and contains no useful information
because it's a copy of subdirs.el.

epg.el: support pinentry mode added in GnuPG 2.1

* epg.el (epg-context-pinentry-mode): New function.
(epg-context-set-pinentry-mode): New function.
(epg--start): Pass --pinentry-mode option to gpg command.

ChangeLog fix

* emacs-lisp-intro.texi (defcustom, defun, simplified-beginning-of-buffer, defvar, Building Robots, Review, save-excursion): `defun' and `defcustom' are now macros rather than special forms. (Bug#13853)

* doc/lispref/internals.texi (Writing Emacs Primitives): Remove unnecessary references to the sources. (Bug#13800)

searching.texi (Regexp Backslash): Doc fix for backslash constructs in regular expressions.

comint.el: (comint-dynamic-complete-functions, comint-mode-map): `comint-dynamic-complete' is obsolete since 24.1, replaced by `completion-at-point'. (Bug#13774)

startup.el (normal-no-mouse-startup-screen): Bug fix, the default key binding for C-h C-o'.  (Bug#13970)

vc.el doc fixes

* lisp/vc/vc.el (vc-print-log-setup-buttons, vc-print-log-internal):
Add doc strings.
(vc-print-log): Clarify interactive prompt.

No longer include timestamp in header of .elc files

This removes needless differences between files compiled at different
times or by different people, or from sources in different locations.
Ref: http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00187.html

* lisp/emacs-lisp/bytecomp.el (byte-compile-insert-header):
No longer include timestamp etc information.

* etc/NEWS: Mention this.

Merge from emacs-24; up to 2012-12-26T22:30:58Z!yamaoka@jpl.org

lisp/faces.el (read-face-name): Bug fix, return just one face if arg multiple is nil

Use add/remove-function to manipulate process-filters.
* lisp/emacs-lisp/nadvice.el (advice--where-alist): Add :override.
(remove-function): Autoload.

* lisp/comint.el (comint-redirect-original-filter-function): Remove.
(comint-redirect-cleanup, comint-redirect-send-command-to-process):
* lisp/vc/vc-cvs.el (vc-cvs-annotate-process-filter,vc-cvs-annotate-command):
* lisp/progmodes/octave-inf.el (inferior-octave-send-list-and-digest):
* lisp/progmodes/prolog.el (prolog-consult-compile):
* lisp/progmodes/gdb-mi.el (gdb, gdb--check-interpreter):
Use add/remove-function instead.
* lisp/progmodes/gud.el (gud-tooltip-original-filter): Remove.
(gud-tooltip-process-output, gud-tooltip-tips):
Use add/remove-function instead.
* lisp/progmodes/xscheme.el (xscheme-previous-process-state): Remove.
(scheme-interaction-mode, exit-scheme-interaction-mode):
Use add/remove-function instead.

* lisp/vc/vc-dispatcher.el: Use lexical-binding.
(vc--process-sentinel): Rename from vc-process-sentinel.
Change last arg to be the code to run.  Don't use vc-previous-sentinel
and vc-sentinel-commands any more.
(vc-exec-after): Allow code to be a function.  Use add/remove-function.
(compilation-error-regexp-alist, view-old-buffer-read-only): Declare.

Better full-screen frame support on MS-Windows.

 src/w32fns.c (w32_fullscreen_rect): New function to compute the
 window rectangle for the given fullscreen mode.
 (w32_wnd_proc): When in a fullscreen mode, WM_WINDOWPOSCHANGING no
 longer tunes the window size.  This keeps the window's edges flush
 with the screen and allows the taskbar to hide itself in fullboth.
 src/w32term.c (w32fullscreen_hook): 'fullboth' now shows without
 window decorations and uses the entire screen.
 src/w32term.h  (w32_fullscreen_rect) Add prototype.
 (struct w32_output): Replace normal_width, normal_height,
 normal_top, and normal_left members with a single normal_placement
 struct.
 (FRAME_NORMAL_WIDTH, FRAME_NORMAL_HEIGHT, FRAME_NORMAL_TOP):
 Remove macros.
 (FRAME_NORMAL_PLACEMENT): New macro.

Fixes: debbugs:14180

Added bug number (Bug#14112) to my last ChangeLog entries.

* automated/imenu-tests.el: New file.

* lisp/progmodes/sh-script.el (sh-imenu-generic-expression): Handle
function names with a single character.

* lisp/progmodes/gud.el (gud-perldb-marker-filter): Understand position info
for subroutines defined in an eval.

Fixes: debbugs:14182

Small fixes to 2013-04-19T02:31:09Z!fgallina@gnu.org

* lisp/ChangeLog: Fix Changelog Entry.

* progmodes/python.el (python-imenu-create-flat-index): Remove
  leftover `message' call and give credit to old
  imenu--flatten-index-alist.

Auto-commit of generated files.

* lisp/bookmark.el (bookmark-completing-read): Improve handling of empty
string.

Fixes: debbugs:14176

* lisp/vc/vc-dispatcher.el (vc-do-command): Get rid of default sentinel msg.

New faster Imenu implementation.

* lisp/progmodes/python.el:
(python-imenu-prev-index-position):
(python-imenu-format-item-label-function)
(python-imenu-format-parent-item-label-function)
(python-imenu-format-parent-item-jump-label-function):
New vars.
(python-imenu-format-item-label)
(python-imenu-format-parent-item-label)
(python-imenu-format-parent-item-jump-label)
(python-imenu--put-parent, python-imenu--build-tree)
(python-imenu-create-index, python-imenu-create-flat-index)
(python-util-popn): New functions.
(python-mode): Set imenu-create-index-function to
python-imenu-create-index.

* test/automated/python-tests.el (python-imenu-prev-index-position-1):
Removed test.
(python-imenu-create-index-1, python-imenu-create-flat-index-1):
New tests.

Fixes: debbugs:14058

* configure.ac: Add DragonFly BSD, mostly same as FreeBSD (tiny change)

Fixes: debbugs:14068

* lisp/winner.el (winner-active-region): Use region-active-p, activate-mark
and deactivate-mark.
* lisp/simple.el (deactivate-mark): Don't inline it.

Fixes: debbugs:14225