Merge branch 'trunk' into xwidget

Conflicts:
	src/Makefile.in
	src/keyboard.c
	src/termhooks.h

5 files changed, 94 insertions, 10 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index c92720bccc8..f80c1b6973c 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,24 @@
+2013-06-05  Teodor Zlatanov  <tzz@lifelogs.com>
+
+        * NEWS: Document new prog-mode symbol prettify support.
+
+2013-06-03  Tassilo Horn  <tsdh@gnu.org>
+
+        * NEWS: Document eshell visual subcommands and options.
+
+2013-06-02  Eric Ludlam <zappo@gnu.org>
+
+        * srecode/c.srt (header_guard): Add :c parameter so it works
+        standalone
+
+2013-06-01  Alex Ott  <alexott@gmail.com>
+
+        * tutorials/TUTORIAL.ru: Fix incorrectly translated wording.
+
+2013-05-31  Tassilo Horn  <tsdh@gnu.org>
+
+        * themes/tsdh-dark-theme.el (tsdh-dark): Refine mode-line faces.
+
 2013-05-25  Xue Fuqiao  <xfq.free@gmail.com>
 
         * refcards/refcard.tex: Refine some entries.  (Bug#14087)
diff --git a/etc/NEWS b/etc/NEWS
index 80546ce985a..1e6088fe671 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -28,6 +28,12 @@ This happens by default if a suitable support library is found at
 build time, like libacl on GNU/Linux.  To prevent this, use the
 configure option `--disable-acl'.
 
+** Emacs can be compiled with file notification support.
+The configure option `--with-file-notification=LIB' enables file
+notification support in Emacs. This option's value should be `yes',
+`no', `gfile', `inotify' or `w32'.  `yes' is a synonym for `w32' on
+MS-Windows, and for `gfile' otherwise.  The default value is `yes'.
+
 ** The configure option --with-crt-dir has been removed.
 It is no longer needed, as the crt*.o files are no longer linked
 specially.
@@ -39,6 +45,18 @@ MS-Windows.  The Windows-specific configure.bat and makefile.w32-in
 files are deprecated.  See the file nt/INSTALL.MSYS for detailed
 instructions.
 
+Using the Posix configure script and Makefile's also means a change in
+the directory structure of the Emacs installation on Windows.  It is
+now the same as on GNU and Unix systems.  In particular, the auxiliary
+programs, such as cmdproxy.exe and hexl.exe, are in
+libexec/emacs/VERSION/i686-pc-mingw32 (where VERSION is the Emacs
+version), version-independent site-lisp is in share/emacs/site-lisp,
+version-specific Lisp files are in share/emacs/VERSION/lisp and in
+share/emacs/VERSION/site-lisp, Info docs are in share/info, and data
+files are in share/emacs/VERSION/etc.  (Emacs knows about all these
+directories and will find the files in there automatically; there's no
+need to set any variables due to this change.)
+
 
 * Startup Changes in Emacs 24.4
 
@@ -117,6 +135,18 @@ You can pick the name of the function and the variables with `C-x 4 a'.
 
 * Changes in Specialized Modes and Packages in Emacs 24.4
 
+** `eshell' now supports visual subcommands and options
+Eshell has been able to handle "visual" commands (interactive,
+non-line oriented commands such as top that require display
+capabilities not provided by eshell) by running them in an Emacs
+terminal emulator.  See `eshell-visual-commands'.
+
+This feature has been extended to subcommands and options that make a
+usually line-oriented command a visual command.  Typical examples are
+"git log" and "git <command> --help" which display their output in a
+pager by default.  See `eshell-visual-subcommands' and
+`eshell-visual-options'.
+
 ** `remember' can now store notes in separates files
 You can use the new function `remember-store-in-files' within the
 `remember-handler-functions' option.
@@ -236,14 +266,36 @@ callers to fit the image to a frame other than the selected frame.
 entries displayed by `Info-index-next', `Info-virtual-index' and
 `info-apropos'.
 
+** Hi-Lock
+
+*** New option `hi-lock-auto-select-face'.  When non-nil, hi-lock commands
+will cycle through faces in `hi-lock-face-defaults' without prompting.
+
++++
+*** New global command `M-s h .' (`highlight-symbol-at-point')
+highlights the symbol found near point without prompting,
+using the next face automatically.
+
 ** Search and Replace
 
+*** New global command `M-s .' (`isearch-forward-symbol-at-point')
+starts a symbol (identifier) incremental search forward with the
+symbol found near point added to the search string initially.
+
 *** `C-x 8 RET' in Isearch mode reads a character by its Unicode name
 and adds it to the search string.
 
+*** `M-s i' in Isearch mode toggles the variable `isearch-invisible'
+between nil and the value of the option `search-invisible' (or `open'
+when it's nil).
+
 *** `query-replace' skips invisible text when `search-invisible' is nil,
 and opens overlays with hidden text when `search-invisible' is `open'.
 
++++
+*** By default, prefix arguments do not now terminate Isearch mode.
+Set `isearch-allow-prefix' to nil to restore old behavior.
+
 ** MH-E has been updated to MH-E version 8.5.
 See MH-E-NEWS for details.
 
@@ -348,7 +400,11 @@ It is layered as:
 
 * Incompatible Lisp Changes in Emacs 24.4
 
-** Default process filers and sentinels are not nil any more.
+** overriding-terminal-local-map does not replace the local keymaps any more.
+It used to disable the minor mode, major mode, and text-property keymaps,
+whereas now it simply has higher precedence.
+
+** Default process filters and sentinels are not nil any more.
 Instead they default to a function which does what the nil value used to do.
 
 ** `read-event' does not return decoded chars in ttys any more.
@@ -389,6 +445,7 @@ file using `set-file-extended-attributes'.
 *** `minibuffer-completion-contents'
 *** `isearch-nonincremental-exit-minibuffer'
 *** `isearch-filter-visible'
+*** `generic-make-keywords-list'
 
 ** `with-wrapper-hook' is obsoleted by `add-function'.
 The few hooks that used with-wrapper-hook are replaced as follows:
@@ -402,8 +459,9 @@ The few hooks that used with-wrapper-hook are replaced as follows:
 ** Support for filesystem notifications.
 Emacs now supports notifications of filesystem changes, such as
 creation, modification, and deletion of files.  This requires the
-'inotify' API on GNU/Linux systems.  On MS-Windows systems, this is
-supported for Windows XP and newer versions.
+`glib' API, or the 'inotify' API (on GNU/Linux systems only).  On
+MS-Windows systems, this is supported for Windows XP and newer
+versions.
 
 ** Changes in autorevert.el
 
@@ -2785,6 +2843,11 @@ should be derived.
 modes, e.g. (add-hook 'prog-mode-hook 'flyspell-prog-mode) to enable
 on-the-fly spell checking for comments and strings.
 
+**** New option, `prog-prettify-symbols' lets the user control symbol
+prettify (replacing a string like "lambda" with the Greek lambda
+character.  The mode derived from `prog-mode' must call
+`prog-prettify-install' with its own custom alist, which can be empty.
+
 *** New hook `change-major-mode-after-body-hook', run by
 `run-mode-hooks' just before any other mode hooks.
 
diff --git a/etc/srecode/c.srt b/etc/srecode/c.srt
index 479f5c9b33d..03e4c369307 100644
--- a/etc/srecode/c.srt
+++ b/etc/srecode/c.srt
@@ -44,7 +44,7 @@ template empty :time :user :file :c
 {{/HEADER}}
 ----
 
-template header_guard :file :blank
+template header_guard :file :blank :c
 ----
 #ifndef {{FILENAME_SYMBOL:upcase}}
 #define {{FILENAME_SYMBOL:upcase}} 1
diff --git a/etc/themes/tsdh-dark-theme.el b/etc/themes/tsdh-dark-theme.el
index 7b0c711f3b4..cd76f22aab1 100644
--- a/etc/themes/tsdh-dark-theme.el
+++ b/etc/themes/tsdh-dark-theme.el
@@ -73,8 +73,8 @@ Used and created by Tassilo Horn.")
  '(magit-section-title ((t (:inherit magit-header :background "dark slate blue"))))
  '(menu ((t (:background "gray30" :foreground "gray70"))))
  '(minibuffer-prompt ((t (:background "yellow" :foreground "medium blue" :box (:line-width -1 :color "red" :style released-button) :weight bold))))
- '(mode-line ((t (:box (:line-width 1 :color "red") :family "DejaVu Sans"))))
- '(mode-line-inactive ((t (:inherit mode-line :foreground "dim gray"))))
+ '(mode-line ((t (:background "gray30" :box (:line-width 1 :color "red") :family "DejaVu Sans"))))
+ '(mode-line-inactive ((t (:inherit mode-line :foreground "dark gray"))))
  '(org-agenda-date ((t (:inherit org-agenda-structure))) t)
  '(org-agenda-date-today ((t (:inherit org-agenda-date :underline t))) t)
  '(org-agenda-date-weekend ((t (:inherit org-agenda-date :foreground "green"))) t)
diff --git a/etc/tutorials/TUTORIAL.ru b/etc/tutorials/TUTORIAL.ru
index ec8461adb3c..a0032f78af4 100644
--- a/etc/tutorials/TUTORIAL.ru
+++ b/etc/tutorials/TUTORIAL.ru
@@ -259,9 +259,9 @@ META. Мы рекомендуем привыкнуть к использован
 говорящее о том, какая команда вызывается, и запросит у вас, хотите ли вы
 продолжать работу и выполнить данную команду.
 
-Если вы действительно попробовать выполнить эту команду, то нажмите клавишу
-<SPC> (пробел) в ответ на заданный вопрос. ��бычно, если вы не хотите
-выполнять запрещенную команду, то ответьте на вопрос нажатием клавиши "n".
+Если вы действительно хотите выполнить эту команду, то нажмите клавишу 
+<SPC> (пробел) в ответ на заданный вопрос. �� если вы не хотите выполнить
+запрещенную команду, то ответьте на вопрос нажатием клавиши "n".
 
 >> Нажмите `C-x C-l' ("запрещенная" команда), а потом ответьте "n" на
    заданный вопрос.
@@ -284,7 +284,7 @@ Emacs может отображать информацию в нескольки
 >> Переместите курсор на эту строку и нажмите C-u 0 C-l.
 
 >> Наберите C-h k C-f.
-   ����см��т��ите, как текущее окно ����ж��ется, когда появится новое окно и
+   ����м��т��те как текущее окно ��мен��ши��ся, когда появится новое окно и
    отобразит документацию для сочетания клавиш C-f.
 
 >> Наберите C-x 1 и посмотрите, как окно с документацией исчезнет.