auto upstream

* emacs-lisp/package.el (describe-package-1): Tell what archive is used to
install the package.

Patch by Nicolas Richard.

* vc/vc-hooks.el (vc-find-file-hook): Don't ask about following links
if we can't get user input.

Fixes: debbugs:6567

* lisp/startup.el (command-line): If simple.el is missing,
test and warn about for some possible causes.

auto upstream

Relocate NEWS entry from 24.3 section to 24.4 where it belongs

* NEWS: Mention ns-use-native-fullscreen.

* lisp/cus-start.el (all): Add ns-use-native-fullscreen.

* src/nsmenu.m (update_frame_tool_bar): Check for negative tool bar
height.

* src/nsterm.h (HAVE_NATIVE_FS): Define if OSX => 10.7.
(EmacsView): Add fs_is_native, fsIsNative, isFullscreen and
updateCollectionBehaviour.

* src/nsterm.m (NEW_STYLE_FS): Remove.
(ns_last_use_native_fullscreen): New variable.
(x_make_frame_visible): Replace NEW_STYLE_FS with isFullscreen.
(x_set_window_size): Do not take title bar and tool bar into account
if isFullscreen returns YES.
(ns_fullscreen_hook): Replace NEW_STYLE_FS with isFullscreen.
(check_native_fs): New function.
(ns_select, ns_read_socket): Call check_native_fs if HAVE_NATIVE_FS.
(ns_term_init): Remove NEW_STYLE_FS.
(updateFrameSize:, windowWillResize:toSize:): Only adjust for title bar
and tool bar if isFullscreen returns NO.
(windowDidResize:): Replace NEW_STYLE_FS with fsIsNative.
(initFrameFromEmacs:): Initialize fs_is_native.  Replace NEW_STYLE_FS
with HAVE_NATIVE_FS.
(window:willUseFullScreenPresentationOptions:): New method.
(windowDidEnterFullScreen:): Replace NEW_STYLE_FS with fsIsNative.
Hide toolbar if not enabled.
(windowDidExitFullScreen:): Call updateCollectionBehaviour.
Restore tool bar if enabled, hide it otherwise (Bug#13444).
(fsIsNative, isFullscreen, updateCollectionBehaviour): New methods.
(toggleFullScreen:): If fs_is_native, call toggleFullScreen on
window.  Do no set FRAME_EXTERNAL_TOOL_BAR (f) to 0.
Check FRAME_EXTERNAL_TOOL_BAR (f) before restoring
FRAME_TOOLBAR_HEIGHT (f).  Call updateFrameSize when going non-fs.
(syms_of_nsterm): Add ns-use-native-fullscreen.

* lisp/profiler.el (profiler-report-mode-map): Add a restart menu entry.

Fix indentation in previous

gamegrid-add-score-with-update-game-score fix

* lisp/play/gamegrid.el (gamegrid-add-score-with-update-game-score):
Fix directory creation in fallback case.

auto upstream

* lisp/vc/vc.el (vc-next-action): Fix inf-loop.
(vc-update-change-log): Use dolist.

Fixes: debbugs:13610

* fileio.c (Qchoose_write_coding_system): Now static.

Fix bugs #13623 and 13626 caused by changes in 2013-02-01T07:23:18Z!dmantipov@yandex.ru.

 src/xdisp.c (window_buffer_changed): region_showing can be negative,
 which still means region is being displayed.
 (redisplay_internal): Resurrect code that forced redisplay of the
 whole window when showing region and the mark has changed.  Record
 the new mark position to allow redisplay optimizations.
 (display_line): If it->region_beg_charpos is non-zero, set the
 window's region_showing member to -1.
 src/window.h (struct window) <region_showing>: Declare ptrdiff_t,
 not bitfield of 1 bit.

Merge FFAP's URI-detection code into thingatpt.el.

* lisp/ffap.el: Require thingatpt.
(ffap-url-at-point): Delegate URI detection to thing-at-point.
All URI-valid characters are now recognized.
(ffap-string-at-point): Use use-region-p.
(ffap-url-regexp): Extra character is handled by thing-at-point.
(ffap-string-at-point-mode-alist): Allow parentheses.
(ffap-newsgroup-regexp, ffap-newsgroup-heads, ffap-newsgroup-p):
Convert to aliases; code moved to thingatpt.el.
(ffap-gnus-hook): Use setq-local.

* lisp/thingatpt.el: Rewrite the URL detection routines, absorbing some
code from ffap.el.
(thing-at-point-beginning-of-url-regexp): New var.
(thing-at-point-uri-schemes): Update list of URI schemes.
(thing-at-point-url-regexp): Variable deleted.
(thing-at-point-markedup-url-regexp): Disallow newlines.
(thing-at-point-newsgroup-regexp)
(thing-at-point-newsgroup-heads)
(thing-at-point-default-mail-uri-scheme): New variables.
(thing-at-point-bounds-of-url-at-point): Rewrite.  Use ffap's
method to find the possible bounds of the URI at point.  New
optional argument to find ill-formed URIs.
(thing-at-point-url-at-point): Rewrite.  New arguments for finding
ill-formed URIs.  Use thing-at-point-bounds-of-url-at-point, and
the scheme-adding heuristics from ffap-url-at-point.
(thing-at-point--bounds-of-well-formed-url): New function.  Do
parens matching to decide whether to include parens in the URI

* test/automated/thingatpt.el: New file.

Fixes: debbugs:5673

ert--explain-format-atom fix for non-characters

* lisp/emacs-lisp/ert.el (ert--explain-format-atom):
Don't try to print non-characters as characters.

Fixes: debbugs:13543

auto upstream

Daniel Colascione 2013-02-03 * emacs.c: Use execvp, not execv, when DAEMON_MUST_EXEC

* net/tramp.el (tramp-debug-message): Extend function exclude list.
(tramp-backtrace): New defun.
(tramp-handle-insert-file-contents): Use `visit' when inserting
the local copy.

* net/tramp-sh.el (tramp-sh-handle-set-visited-file-modtime): Use
`remote-file-name-inhibit-cache'.

* emacs.c: Use execvp, not execv, when DAEMON_MUST_EXEC, so that
daemon mode works on cygw32 when Emacs is installed and not just
during development.

* lisp/url/url-cache.el (url-cache-create-filename-using-md5): Don't waste your
time `requiring' a builtin feature.
* lisp/subr.el (internal--called-interactively-p--get-frame): Remove
left-over message.

* lisp/progmodes/cperl-mode.el (cperl-mode): Avoid byte-compile warning.

Fixes: debbugs:13614

* lisp/subr.el (internal--called-interactively-p--get-frame): Avoid filling
current-load-list.

Fixes: debbugs:13366

Fix byte compilation warning in files testsuite.

* automated/files.el (file-test--do-local-variables-test): Avoid
compilation warning message.

auto upstream

Avoid file time stamp bug on MS-Windows.

* fileio.c (Fwrite_region): Don't use the heuristic on empty files,
as FAT32 doesn't update time stamps when truncating them.
Also, check that a file time stamp is not a multiple of 100 ns;
this should catch all instances of the problem on MS-Windows,
as its native file system resolution is 100 ns or worse, and
checking for a non-multiple of 100 ns should impose only a small
overhead on systems with ns resolution.

Fixes: debbugs:13149

Avoid encoding file names run through dostounix_filename on MS-Windows.

 src/w32.c (normalize_filename): Accept an additional argument
 MULTIBYTE; if non-zero, traverse the file name by bytes and don't
 downcase it even if w32-downcase-file-names is non-nil.
 (dostounix_filename): Accept an additional argument MULTIBYTE and
 pass it to normalize_filename.
 (emacs_root_dir): Adjust.
 src/msdos.h (dostounix_filename): Adjust prototype.
 src/w32.h (dostounix_filename): Adjust prototype.
 src/msdos.c (dostounix_filename): Accept an additional argument and
 ignore it.
 (init_environment): Adjust callers of dostounix_filename.
 src/fileio.c (Ffile_name_directory, file_name_as_directory)
 (directory_file_name, Fexpand_file_name)
 (Fsubstitute_in_file_name): [DOS_NT] Adjust call to
 dostounix_filename.
 [WINDOWSNT]: Downcase file names if w32-downcase-file-names is
 non-nil.
 (Fsubstitute_in_file_name): [DOS_NT] Don't downcase environment
 variables, as egetenv is case-insensitive for DOS_NT.
 src/dired.c (file_name_completion): Don't call Fdirectory_file_name
 with an encoded file name.
 src/w32proc.c (Fw32_short_file_name, Fw32_long_file_name): Adjust
 calls to dostounix_filename.
 src/w32fns.c (Fx_file_dialog): Adjust call to dostounix_filename.
 src/unexw32.c (unexec): Adjust call to dostounix_filename.
 src/termcap.c (tgetent) [MSDOS]: Adjust call to dostounix_filename.
 src/emacs.c (decode_env_path) [DOS_NT]: Adjust call to
 dostounix_filename.
 src/callproc.c (Fcall_process) [MSDOS]: Adjust call to
 dostounix_filename.

* progmodes/compile.el (compilation-mode-hook)
(compilation-start-hook, compilation-window-height): Simplify
docstrings.  (Bug#13379)

* progmodes/compile.el (compilation-start-hook): Simplify docstring.
(Bug#13379)

* progmodes/compile.el (compilation-error-regexp-alist-alist):
Identify g++ template instantiation trace.  (Bug#12287)

Spelling fixes.

Merge from emacs-24; up to 2012-12-13T09:45:54Z!lekktu@gmail.com

* lisp/progmodes/grep.el (grep-regexp-alist): Use variable grep-match-face
instead of hard-coded default face `match'.  (Bug#9438)

* lisp/mouse.el (mouse-drag-track): Always deactivate the mark before
running the final event's command since that command is in charge of
activating the mark if needed.

Fixes: debbugs:13523

* lisp/replace.el (perform-replace): Move let-bindings of isearch-*
variables deeper to the loop that searches for the next match.
Add bindings for `isearch-nonincremental' and `isearch-adjusted'.
Use `isearch-search-fun-default' instead of `isearch-search-fun'.

* lisp/isearch.el (isearch-search-fun-default): Check for null
first element of isearch-cmds as a precaution when it's used
with inactive isearch.

Fixes: debbugs:13579

auto upstream

* net/tramp.el (tramp-check-for-regexp): Avoid "Args out of range"
error when buffer in question is narrowed so position 1 is out of
visible part.

Fix timestamp bug when write-region appends nothing.

* fileio.c (Fwrite_region): When neither O_EXCL nor O_TRUNC is used,
the file's time stamp doesn't change if Emacs happens to write nothing
to the file, and on a buggy file system this could cause Emacs to
incorrectly infer that the file system doesn't have the bug.
Avoid this problem by inhibiting the inference in this case.

Fixes: debbugs:13149

* vc/vc-arch.el (vc-arch-registered):
* vc/vc-bzr.el (vc-bzr-registered):
* vc/vc-cvs.el (vc-cvs-registered):
* vc/vc-git.el (vc-git-registered):
* vc/vc-hg.el (vc-hg-registered):
* vc/vc-mtn.el (vc-mtn-registered):
* vc/vc-svn.el (vc-svn-registered): Suppress load messages.
(Bug#13139)

* info.el (Info-next-reference, Info-prev-reference): Add numeric
prefix argument.  (Bug#11656)

* lisp/help-fns.el (help-split-fundoc): Don't insert byte-compiled body.

Auto-commit of loaddefs files.

Auto-commit of loaddefs files.

Auto-commit of generated files.

Make sure program names are encoded before using them to invoke subprocesses.

 src/callproc.c (Fcall_process): Make sure program name in PATH and
 new_argv[0] is encoded, if needed.  Otherwise, un-encoded string
 is passed to exec/spawnve, which fails unless the file-name
 encoding is UTF-8.

w32proc.c (sys_spawnve): Initialize escape_char.

 src/w32proc.c (sys_spawnve): Make sure escape_char is initialized,
 even if w32-quote-process-args is nil.

* vc/vc-hooks.el (vc-menu-map): Disable vc-rollback menu item
if the backend is known not to support it.

* imenu.el (imenu-default-create-index-function):
Tweak infinite loop test to check for forward motion as well as none.

* net/soap-client.el (soap-invoke): Encode the string for
`url-request-data' as UTF-8.  Fixes
<http://code.google.com/p/emacs-soap-client/issues/detail?id=16>.

* window.h (struct window): Convert base_line_number, base_line_pos
and column_number_displayed members from Lisp_Object to ptrdiff_t.
Convert region_showing member from Lisp_Object to bitfield.
Remove sequence_number member.  Adjust comments.
* window.c (sequence_number): Remove.
(make_window): Initialize column_number_displayed.
* print.c (print_object): Follow the printed representation of
frames and print window pointer to distinguish between windows.
(adjust_window_count): Invalidate base_line_pos.  Adjust comment.
* xdisp.c (wset_base_line_number, wset_base_line_pos)
(wset_column_number_displayed, wset_region_showing): Remove.
(window_buffer_changed, mode_line_update_needed, redisplay_internal)
(try_scrolling, try_cursor_movement, redisplay_window)
(try_window_reusing_current_matrix, try_window_id, display_line)
(display_mode_lines, decode_mode_spec): Adjust users.
* .gdbinit (pwinx): Do not print sequence_number.

Use fdopendir, fstatat and readlinkat, for efficiency.

On my host, this speeds up directory-files-and-attributes by a
factor of 3, when applied to Emacs's src directory.
These functions are standardized by POSIX and are common these
days; fall back on a (slower) gnulib implementation if the host
is too old to supply them.
* .bzrignore: Add lib/dirent.h.
* lib/Makefile.am (libgnu_a_SOURCES): Add openat-die.c, save-cwd.c.
* lib/careadlinkat.c, lib/careadlinkat.h: Merge from gnulib,
incorporating: 2013-01-29 careadlinkat: do not provide careadlinkatcwd.
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/dirent.in.h, lib/fdopendir.c, lib/fstatat.c, lib/openat-priv.h:
* lib/openat-proc.c, lib/openat.h, m4/dirent_h.m4, m4/fdopendir.m4:
* m4/fstatat.m4: New files, from gnulib.
* lib/openat-die.c, lib/save-cwd.c, lib/save-cwd.h: New files.
These last three are specific to Emacs and are not copied from gnulib.
They are simpler than the gnulib versions and are tuned for Emacs.
* admin/merge-gnulib (GNULIB_MODULES): Add fdopendir, fstatat, readlinkat.
(GNULIB_TOOL_FLAGS): Do not avoid at-internal, openat-h.
Avoid dup, open, opendir.
* nt/inc/sys/stat.h (fstatat):
* nt/inc/unistd.h (readlinkat): New decls.
* src/conf_post.h (GNULIB_SUPPORT_ONLY_AT_FDCWD): Remove.
* src/dired.c: Include <fcntl.h>.
(open_directory): New function, which uses open and fdopendir
rather than opendir.  DOS_NT platforms still use opendir, though.
(directory_files_internal, file_name_completion): Use it.
(file_attributes): New function, with most of the old Ffile_attributes.
(directory_files_internal, Ffile_attributes): Use it.
(file_attributes, file_name_completion_stat): First arg is now fd,
not dir name.  All uses changed.  Use fstatat rather than lstat +
stat.
(file_attributes): Use emacs_readlinkat rather than Ffile_symlink_p.
* src/fileio.c: Include <allocator.h>, <careadlinkat.h>.
(emacs_readlinkat): New function, with much of the old
Ffile_symlink_p, but with an fd argument for speed.
It uses readlinkat rather than careadlinkatcwd, so that it
need not assume the working directory.
(Ffile_symlink_p): Use it.
* src/filelock.c (current_lock_owner): Use emacs_readlinkat
rather than emacs_readlink.
* src/lisp.h (emacs_readlinkat): New decl.
(READLINK_BUFSIZE, emacs_readlink): Remove.
* src/sysdep.c: Do not include <allocator.h>, <careadlinkat.h>.
(emacs_norealloc_allocator, emacs_readlink): Remove.
This stuff is moved to fileio.c.
* src/w32.c (fstatat, readlinkat): New functions.
(careadlinkat): Don't check that fd == AT_FDCWD.
(careadlinkatcwd): Remove; no longer needed.

Fixes: debbugs:13539

Remove info duplicated from manual; convert to outline mode format.

Move lisp/calc/README* to etc/CALC-NEWS

* make-dist: Only README files exist in lisp/ now, not README*.

* doc/misc/calc.texi (Help Commands): Mention etc/CALC-NEWS.

* etc/CALC-NEWS: Move here from lisp/calc/README, README.prev.

* lisp/calc/README, lisp/calc/README.prev: Rename/merge to etc/CALC-NEWS.

Merge calc news from lisp/calc/README into etc/NEWS files

* doc/misc/calc.texi (Help Commands): Update calc-view-news description.

* lisp/calc/calc-help.el (calc-view-news): Use view-emacs-news.

* lisp/calc/README: Move news entries from here...
* etc/NEWS, etc/NEWS.23: ... to here

auto upstream

fix last patch

Sync CEDET and EIEIO version numbers with upstream.

ChangeLog for previous fileio.c change

* lisp/textmodes/remember.el (remember-clipboard): Doc fix.

Simplify part of previous Fwrite_region change

* net/tramp.el (tramp-tramp-file-p): Comment check for
`string-as-unibyte'.  The function does not exist on XEmacs, and
likely we need another approach.

* net/tramp-sh.el (tramp-compute-multi-hops): Check, whether
`tramp-gw-*' variables are bound.

Reduce delay between backing up a file and saving new version

* lisp/files.el (basic-save-buffer-2):
Choose coding system for writing the file before backing it up.

* src/fileio.c (choose_write_coding_system): Make it callable from Lisp.
(Fwrite_region): If coding-system-for-write is set, don't call
choose_write_coding_system.
Move the last piece of choose_write_coding_system here.
(syms_of_fileio): Add choose-write-coding-system.

Fixes: debbugs:13522

* lisp/simple.el (cycle-spacing): New command.
(just-one-space): Use it.

* lisp/progmodes/opascal.el: Rename from delphi.el.  Use lexical-binding.
(opascal-newline-always-indents): Remove custom.
(opascal-tab, opascal-newline): Remove commands.
(opascal-new-comment-line): Insert "\n" instead of calling newline.
(opascal-mode-map): Keep default bindings for RET and TAB and DEL.
(opascal-save-match-data): Remove, use save-match-data instead.
(opascal-save-state): Use with-silent-modifications.

* lisp/progmodes/pascal.el (pascal-mode-syntax-table): Accept //..\n comments.

Fixes: debbugs:13585

* lisp/frame.el (toggle-frame-maximized, toggle-frame-fullscreen):
Use fullboth as an alias for fullscreen.  Suggested by Jan Djärv in
<http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00203.html>.

auto upstream

lisp/gnus/gnus-int.el (gnus-backend-trace): Honour gnus-backend-trace

* lisp/progmodes/make-mode.el (makefile-backslash-region): Don't compute
column if we're just deleting the backslashes.
(makefile-fill-paragraph): Use eolp.

* lisp/progmodes/make-mode.el (makefile-fill-paragraph): Reset syntax-table
properties.

Fixes: debbugs:13179

* autorevert.el (auto-revert-use-notify): Fix docstring.

* lisp/imenu.el (imenu--truncate-items): Fix subalist checking.

Fixes: debbugs:13576

Merge from emacs-24; up to 2012-12-13T00:52:17Z!yamaoka@jpl.org

mouse-drag-line changes for mouse-1 in header-line

* lisp/mouse.el (mouse-drag-line): Avoid pushing same event onto
unread-command-events twice in some cases.  This tries to implement
the 2012-07-26 changes in a different way.

Fixes: debbugs:13560

* lisp/jit-lock.el (jit-lock-stealth-chunk-start): Don't widen.
(jit-lock-mode, jit-lock-functions, jit-lock-context-unfontify-pos):
Use defvar-local.
(jit-lock-register): Use setq-local.

Fixes: debbugs:13542

* progmodes/python.el
(python-pdbtrack-comint-output-filter-function): Enhancements on
stacktrace detection.  (thanks @gnovak)

calc-units.el (math-default-units-table): Remove initial value.

(calc-convert-units): Treat expressions where all the units cancel as
if they didn't have units.

lisp/gnus/mml.el (mml-insert-part): Insert closing tag

lisp/gnus/mm-decode.el (mm-save-part): Handle invalid read-file-name results

* net/tramp.el (tramp-process-connection-type): Fix docstring.
(tramp-completion-reread-directory-timeout): Fix type.
(tramp-connection-min-time-diff): New defcustom.

* net/tramp-sh.el (tramp-maybe-open-connection): Use it.

Merge from emacs-24; up to 2012-12-12T22:29:54Z!yamaoka@jpl.org

ChangeLog date fix

* imenu.el (imenu-default-create-index-function):
Put back a version of the infinite loop test removed 2013-01-23.

Revert changes, which were committed with 2013-01-29T16:03:40Z!michael.albinus@gmx.de by accident.

auto upstream

Amend to fontify /regexp/s in actions correctly.
cc-awk.el (c-awk-harmless-char-re, c-awk-harmless-string*-re):
(c-awk-harmless-string*-here-re): braces, parens and semicolons are no
longer included.
(c-awk-harmless-line-char-re, c-awk-harmless-line-string*-re): What used
to be these variables without "-line" in the name.
(c-awk-neutral-re): { is no longer neutral.  Escaped newlines now are.
(c-awk-non-arith-op-bra-re): Now also matches {.
(c-awk-pre-exp-alphanum-kwd-re): New regexp to match "print", "return",
and "case".
(c-awk-kwd-regexp-sign-re): New, to match "print", etc., followed by /.
(c-awk-syntax-tablify-/): Check special cases "print /re/", etc.
(c-awk-set-syntax-table-properties): Extend FSM to handle {,},(,),;.

* autorevert.el (auto-revert-use-notify): Use
`custom-initialize-default' for initialization.  (Bug#13583)

* net/tramp-sh.el (tramp-sh-handle-start-file-process): Fix previous patch.
(tramp-gw-tunnel-method, tramp-gw-socks-method): Declare for
compatibility.
(tramp-compute-multi-hops): Check, whether
`tramp-gw-tunnel-method' and `tramp-gw-socks-method' are non-nil.

* net/ange-ftp.el (ange-ftp-skip-msgs): Add another message.

* net/tramp-sh.el (tramp-sh-handle-start-file-process): Catch
`suppress'.  Otherwise, `tramp-run-real-handler' might be called
in `tramp-file-name-handler'.

auto upstream

* progmodes/python.el (python-shell-parse-command): Find
python-shell-interpreter with modified environment.

* lisp/hi-lock.el (hi-lock-unface-buffer): Don't assume `face' is a symbol.

Fixes: debbugs:13297

Make opendir on MS-Windows accept a 'const char *'.

 src/w32.c (opendir): Now accepts a 'const char *'.

 nt/inc/dirent.h (opendir): Update prototype.

Remove obsolete redisplay code.  See the discussion at
http://lists.gnu.org/archive/html/emacs-devel/2013-01/msg00576.html.
* dispnew.c (preemption_period, preemption_next_check): Remove.
(Vredisplay_preemption_period): Likewise.
(update_frame, update_single_window, update_window, update_frame_1):
Adjust users.  Always assume that PERIODIC_PREEMPTION_CHECKING is not
used, following the 2012-06-22 change.

* progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight
  nested constants, too.  \_< broke that.

* progmodes/ruby-mode.el (ruby-move-to-block): Work with (maybe
  temporarily) broken indentation.
* automated/ruby-mode-tests.el (ruby-block-test-example):
  Break indentation of the do block opener and add a line inside it.
* automated/ruby-mode-tests.el (works-on-do, ok-with-three):
  Adjust line numbers.

Sync Version: headers with -version variables

auto upstream

* automated/ruby-mode-tests.el
  (ruby-indent-spread-args-in-parens): New test.