[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r116967: Merge from emacs-24; up to r116940
|
From: |
Glenn Morris |
|
Subject: |
[Emacs-diffs] trunk r116967: Merge from emacs-24; up to r116940 |
|
Date: |
Fri, 11 Apr 2014 06:43:55 +0000 |
|
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 116967 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Thu 2014-04-10 23:43:20 -0700
message:
Merge from emacs-24; up to r116940
modified:
ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1538
configure.ac
configure.in-20091113204419-o5vbwnq5f7feedwu-783
etc/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1485
etc/refcards/cs-dired-ref.tex
csdiredref.tex-20091113204419-o5vbwnq5f7feedwu-5126
etc/refcards/cs-refcard.tex
csrefcard.tex-20091113204419-o5vbwnq5f7feedwu-5128
etc/refcards/cs-survival.tex
cssurvival.tex-20091113204419-o5vbwnq5f7feedwu-5129
etc/refcards/sk-dired-ref.tex
skdiredref.tex-20091113204419-o5vbwnq5f7feedwu-5154
etc/refcards/sk-refcard.tex
skrefcard.tex-20091113204419-o5vbwnq5f7feedwu-5156
etc/refcards/sk-survival.tex
sksurvival.tex-20091113204419-o5vbwnq5f7feedwu-5157
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/elec-pair.el elecpair.el-20131227124533-yaq8recs0j0ggt67-1
lisp/net/tramp-sh.el trampsh.el-20100913133439-a1faifh29eqoi4nh-1
lisp/net/tramp.el tramp.el-20091113204419-o5vbwnq5f7feedwu-2427
lisp/nxml/rng-cmpct.el
rngcmpct.el-20091113204419-o5vbwnq5f7feedwu-7821
lisp/progmodes/pascal.el pascal.el-20091113204419-o5vbwnq5f7feedwu-636
lisp/vc/ediff-diff.el
ediffdiff.el-20091113204419-o5vbwnq5f7feedwu-845
lisp/vc/ediff-init.el
ediffinit.el-20091113204419-o5vbwnq5f7feedwu-846
lisp/vc/ediff-util.el
ediffutil.el-20091113204419-o5vbwnq5f7feedwu-848
make-dist makedist-20091113204419-o5vbwnq5f7feedwu-476
nt/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1545
nt/emacs.rc emacs.rc-20091113204419-o5vbwnq5f7feedwu-875
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/Makefile.in makefile.in-20091113204419-o5vbwnq5f7feedwu-631
src/keyboard.c keyboard.c-20091113204419-o5vbwnq5f7feedwu-449
test/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-8588
test/automated/electric-tests.el
electrictests.el-20131226202454-s3cqbs9maop0w8qy-1
test/indent/pascal.pas pascal.pas-20111213152608-1lfkfh2fgqkiq72i-1
=== modified file 'ChangeLog'
--- a/ChangeLog 2014-04-07 21:19:31 +0000
+++ b/ChangeLog 2014-04-11 06:43:20 +0000
@@ -1,3 +1,13 @@
+2014-04-11 Glenn Morris <address@hidden>
+
+ * make-dist: Do not distribute generated admin/grammars/Makefile.
+ Do distribute lib-src/update-game-score.exe.manifest.
+
+2014-04-11 Ken Brown <address@hidden>
+
+ * configure.ac (EMACS_MANIFEST): Revert last change (but leave
+ UPDATE_MANIFEST empty).
+
2014-04-07 Ken Brown <address@hidden>
* configure.ac (EMACS_MANIFEST, UPDATE_MANIFEST): Leave these
=== modified file 'configure.ac'
--- a/configure.ac 2014-04-07 20:54:16 +0000
+++ b/configure.ac 2014-04-11 06:43:20 +0000
@@ -1835,6 +1835,10 @@
W32_OBJ="w32fns.o w32menu.o w32reg.o w32font.o w32term.o"
W32_OBJ="$W32_OBJ w32xfns.o w32select.o w32uniscribe.o"
EMACSRES="emacs.res"
+ case "$canonical" in
+ x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;;
+ *) EMACS_MANIFEST="emacs-x86.manifest" ;;
+ esac
if test "${opsys}" = "cygwin"; then
W32_LIBS="$W32_LIBS -lkernel32 -luser32 -lgdi32 -lole32 -lcomdlg32"
W32_LIBS="$W32_LIBS -lusp10 -lcomctl32 -lwinspool"
@@ -1842,10 +1846,6 @@
# the rc file), not a linker script.
W32_RES_LINK="-Wl,emacs.res"
else
- case "$canonical" in
- x86_64-*-*) EMACS_MANIFEST="emacs-x64.manifest" ;;
- *) EMACS_MANIFEST="emacs-x86.manifest" ;;
- esac
UPDATE_MANIFEST=update-game-score.exe.manifest
W32_OBJ="$W32_OBJ w32.o w32console.o w32heap.o w32inevt.o w32proc.o"
W32_LIBS="$W32_LIBS -lwinmm -lgdi32 -lcomdlg32"
=== modified file 'etc/ChangeLog'
--- a/etc/ChangeLog 2014-04-01 13:20:20 +0000
+++ b/etc/ChangeLog 2014-04-11 06:43:20 +0000
@@ -1,3 +1,10 @@
+2014-04-11 Glenn Morris <address@hidden>
+
+ * refcards/cs-dired-ref.tex, refcards/cs-refcard.tex:
+ * refcards/cs-survival.tex, refcards/sk-dired-ref.tex:
+ * refcards/sk-refcard.tex, refcards/sk-survival.tex:
+ Input "utf8off", which seems to be needed.
+
2014-04-01 Michael Albinus <address@hidden>
* NEWS: `url-handler-mode' passes operations to Tramp for some
=== modified file 'etc/refcards/cs-dired-ref.tex'
--- a/etc/refcards/cs-dired-ref.tex 2014-01-01 07:43:34 +0000
+++ b/etc/refcards/cs-dired-ref.tex 2014-04-11 06:09:12 +0000
@@ -31,6 +31,11 @@
% Czech hyphenation rules applied
\chyph
+% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian)
+% aborts with: "! UTF-8 INPUT IS CORRUPTED !
+% May be you are using another input encoding"
+\input utf8off
+
% This file can be printed with 1, 2, or 3 columns per page.
% Specify how many you want here.
\newcount\columnsperpage
=== modified file 'etc/refcards/cs-refcard.tex'
--- a/etc/refcards/cs-refcard.tex 2014-01-01 07:43:34 +0000
+++ b/etc/refcards/cs-refcard.tex 2014-04-11 06:09:12 +0000
@@ -49,6 +49,11 @@
% Czech hyphenation rules applied
\chyph
+% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian)
+% aborts with: "! UTF-8 INPUT IS CORRUPTED !
+% May be you are using another input encoding"
+\input utf8off
+
% This file can be printed with 1, 2, or 3 columns per page.
% Specify how many you want here.
\newcount\columnsperpage
=== modified file 'etc/refcards/cs-survival.tex'
--- a/etc/refcards/cs-survival.tex 2014-01-01 07:43:34 +0000
+++ b/etc/refcards/cs-survival.tex 2014-04-11 06:09:12 +0000
@@ -54,6 +54,11 @@
% Czech hyphenation rules applied
\chyph
+% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian)
+% aborts with: "! UTF-8 INPUT IS CORRUPTED !
+% May be you are using another input encoding"
+\input utf8off
+
\input emacsver.tex
\def\copyrightnotice{\penalty-1\vfill
=== modified file 'etc/refcards/sk-dired-ref.tex'
--- a/etc/refcards/sk-dired-ref.tex 2014-01-01 07:43:34 +0000
+++ b/etc/refcards/sk-dired-ref.tex 2014-04-11 06:09:12 +0000
@@ -32,6 +32,11 @@
% Slovak hyphenation rules applied
\shyph
+% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian)
+% aborts with: "! UTF-8 INPUT IS CORRUPTED !
+% May be you are using another input encoding"
+\input utf8off
+
% This file can be printed with 1, 2, or 3 columns per page.
% Specify how many you want here.
\newcount\columnsperpage
=== modified file 'etc/refcards/sk-refcard.tex'
--- a/etc/refcards/sk-refcard.tex 2014-01-01 07:43:34 +0000
+++ b/etc/refcards/sk-refcard.tex 2014-04-11 06:09:12 +0000
@@ -50,6 +50,11 @@
% Slovak hyphenation rules applied
\shyph
+% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian)
+% aborts with: "! UTF-8 INPUT IS CORRUPTED !
+% May be you are using another input encoding"
+\input utf8off
+
% This file can be printed with 1, 2, or 3 columns per page.
% Specify how many you want here.
\newcount\columnsperpage
=== modified file 'etc/refcards/sk-survival.tex'
--- a/etc/refcards/sk-survival.tex 2014-01-01 07:43:34 +0000
+++ b/etc/refcards/sk-survival.tex 2014-04-11 06:09:12 +0000
@@ -55,6 +55,11 @@
% Slovak hyphenation rules applied
\shyph
+% Without this, pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian)
+% aborts with: "! UTF-8 INPUT IS CORRUPTED !
+% May be you are using another input encoding"
+\input utf8off
+
\input emacsver.tex
\def\copyrightnotice{\penalty-1\vfill
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2014-04-11 01:06:35 +0000
+++ b/lisp/ChangeLog 2014-04-11 06:43:20 +0000
@@ -1,5 +1,28 @@
2014-04-11 Stefan Monnier <address@hidden>
+ Ediff's overlay priorities cause more trouble than they solve.
+ * vc/ediff-init.el (ediff-shadow-overlay-priority): Remove variable.
+ (ediff-highest-priority): Remove function (bug#17234).
+ * vc/ediff-util.el (ediff-highlight-diff-in-one-buffer):
+ * vc/ediff-diff.el (ediff-set-diff-overlays-in-one-buffer)
+ (ediff-set-fine-diff-properties-in-one-buffer): Don't mess with
+ overlay priorities.
+
+2014-04-11 Feng Li <address@hidden> (tiny change)
+
+ * progmodes/pascal.el (pascal-font-lock-keywords): Fix incorrect format
+ entry; use symbol boundaries to avoid mis-matches.
+
+2014-04-11 Michael Albinus <address@hidden>
+
+ * net/tramp.el (tramp-file-name-handler)
+ (tramp-completion-file-name-handler): Avoid recursive loading.
+
+ * net/tramp-sh.el (tramp-make-copy-program-file-name):
+ Quote result also locally.
+
+2014-04-11 Stefan Monnier <address@hidden>
+
* emulation/cua-base.el (<toplevel>, cua--pre-command-handler-1):
Remove left-over code.
@@ -1186,7 +1209,7 @@
2014-03-04 Michal Nazarewicz <address@hidden>
- * binding.el: Add comment describing why C-d binds to `delete-char'.
+ * bindings.el: Add comment describing why C-d binds to `delete-char'.
* simple.el (delete-forward-char): Mark as interactive-only.
2014-03-03 Juanma Barranquero <address@hidden>
@@ -2243,7 +2266,7 @@
* ielm.el (ielm-mode-hook):
* emacs-lisp/lisp-mode.el (emacs-lisp-mode-hook)
(lisp-interaction-mode-hook):
- * progmodes/cfengine.e (cfengine3-documentation-function):
+ * progmodes/cfengine.el (cfengine3-documentation-function):
Replace obsolete alias `turn-on-eldoc-mode' with `eldoc-mode'.
2014-01-30 Stefan Monnier <address@hidden>
=== modified file 'lisp/elec-pair.el'
--- a/lisp/elec-pair.el 2014-04-07 20:54:16 +0000
+++ b/lisp/elec-pair.el 2014-04-11 06:43:20 +0000
@@ -343,7 +343,7 @@
(cons innermost outermost)))
(defvar electric-pair-string-bound-function 'point-max
- "Next buffer position where strings are syntatically unexpected.
+ "Next buffer position where strings are syntactically unexpected.
Value is a function called with no arguments and returning a
buffer position. Major modes should set this variable
buffer-locally if they experience slowness with
=== modified file 'lisp/net/tramp-sh.el'
--- a/lisp/net/tramp-sh.el 2014-03-25 09:49:37 +0000
+++ b/lisp/net/tramp-sh.el 2014-04-10 07:17:40 +0000
@@ -4836,9 +4836,10 @@
(host (tramp-file-name-real-host vec))
(localname (tramp-shell-quote-argument
(tramp-file-name-localname vec))))
- (if (not (zerop (length user)))
- (format "address@hidden:%s" user host localname)
- (format "%s:%s" host localname))))
+ (shell-quote-argument
+ (if (not (zerop (length user)))
+ (format "address@hidden:%s" user host localname)
+ (format "%s:%s" host localname)))))
(defun tramp-method-out-of-band-p (vec size)
"Return t if this is an out-of-band method, nil otherwise."
=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2014-03-25 08:16:49 +0000
+++ b/lisp/net/tramp.el 2014-04-10 07:17:40 +0000
@@ -2106,7 +2106,16 @@
Falls back to normal file name handler if no Tramp file name handler exists."
(if tramp-mode
(save-match-data
- (let* ((filename
+ (let* ((default-directory
+ ;; Some packages set the default directory to a
+ ;; remote path, before tramp.el has been loaded.
+ ;; This results in recursive loading. Therefore, we
+ ;; set `default-directory' to a local path. `args'
+ ;; could also be remote when loading tramp.el, but
+ ;; that would be such perverse we don't care about.
+ (if load-in-progress
+ temporary-file-directory default-directory))
+ (filename
(tramp-replace-environment-variables
(apply 'tramp-file-name-for-operation operation args)))
(completion (tramp-completion-mode-p))
@@ -2218,8 +2227,11 @@
"Invoke Tramp file name completion handler.
Falls back to normal file name handler if no Tramp file name handler exists."
;; We bind `directory-sep-char' here for XEmacs on Windows, which
- ;; would otherwise use backslash.
+ ;; would otherwise use backslash. For `default-directory', see
+ ;; comment in `tramp-file-name-handler'.
(let ((directory-sep-char ?/)
+ (default-directory
+ (if load-in-progress temporary-file-directory default-directory))
(fn (assoc operation tramp-completion-file-name-handler-alist)))
(if (and
;; When `tramp-mode' is not enabled, we don't do anything.
=== modified file 'lisp/nxml/rng-cmpct.el'
--- a/lisp/nxml/rng-cmpct.el 2014-03-21 06:56:55 +0000
+++ b/lisp/nxml/rng-cmpct.el 2014-04-10 19:12:34 +0000
@@ -363,7 +363,7 @@
"*")))
(defun rng-c-process-escapes ()
- ;; Check for any nuls, since we will use nul chars
+ ;; Check for any NULs, since we will use NUL chars
;; for internal purposes.
(let ((pos (search-forward "\C-@" nil t)))
(and pos
@@ -932,4 +932,3 @@
(provide 'rng-cmpct)
;;; rng-cmpct.el
-
=== modified file 'lisp/progmodes/pascal.el'
--- a/lisp/progmodes/pascal.el 2014-03-14 00:22:33 +0000
+++ b/lisp/progmodes/pascal.el 2014-04-10 13:56:28 +0000
@@ -166,21 +166,19 @@
(3 font-lock-function-name-face))
;; ("type" "const" "real" "integer" "char" "boolean" "var"
;; "record" "array" "file")
- (,(concat "\\<\\(array\\|boolean\\|c\\(har\\|onst\\)\\|file\\|"
- "integer\\|re\\(al\\|cord\\)\\|type\\|var\\)\\>")
- font-lock-type-face)
- ("\\<\\(label\\|external\\|forward\\)\\>" . font-lock-constant-face)
- ("\\<\\([0-9]+\\)[ \t]*:" 1 font-lock-function-name-face)
+ (,(concat "\\_<\\(array\\|boolean\\|c\\(har\\|onst\\)\\|file\\|"
+ "integer\\|re\\(al\\|cord\\)\\|type\\|var\\)\\_>")
+ . font-lock-type-face)
+ ("\\_<\\(label\\|external\\|forward\\)\\_>" . font-lock-constant-face)
+ ("\\_<\\([0-9]+\\)[ \t]*:" 1 font-lock-function-name-face)
;; ("of" "to" "for" "if" "then" "else" "case" "while"
;; "do" "until" "and" "or" "not" "in" "with" "repeat" "begin" "end")
- ,(concat "\\<\\("
+ ,(concat "\\_<\\("
"and\\|begin\\|case\\|do\\|e\\(lse\\|nd\\)\\|for\\|i[fn]\\|"
"not\\|o[fr]\\|repeat\\|t\\(hen\\|o\\)\\|until\\|w\\(hile\\|ith\\)"
- "\\)\\>")
- ("\\<\\(goto\\)\\>[ \t]*\\([0-9]+\\)?"
- 1 font-lock-keyword-face)
- ("\\<\\(goto\\)\\>[ \t]*\\([0-9]+\\)?"
- 2 font-lock-keyword-face t))
+ "\\)\\_>")
+ ("\\_<\\(goto\\)\\_>[ \t]*\\([0-9]+\\)?"
+ (1 font-lock-keyword-face) (2 font-lock-keyword-face t)))
"Additional expressions to highlight in Pascal mode.")
(defconst pascal--syntax-propertize
=== modified file 'lisp/vc/ediff-diff.el'
--- a/lisp/vc/ediff-diff.el 2014-01-01 07:43:34 +0000
+++ b/lisp/vc/ediff-diff.el 2014-04-10 19:15:01 +0000
@@ -587,7 +587,6 @@
(setq pt-saved (ediff-with-current-buffer buff (point)))))
(setq overlay (ediff-make-bullet-proof-overlay begin end buff))
- (ediff-overlay-put overlay 'priority ediff-shadow-overlay-priority)
(ediff-overlay-put overlay 'ediff-diff-num current-diff)
(if (and (ediff-has-face-support-p)
ediff-use-faces ediff-highlight-all-diffs)
@@ -822,20 +821,9 @@
'default
(ediff-get-symbol-from-alist
buf-type ediff-fine-diff-face-alist)
- ))
- (priority (if default
- 0
- (1+ (or (ediff-overlay-get
- (symbol-value
- (ediff-get-symbol-from-alist
- buf-type
- ediff-current-diff-overlay-alist))
- 'priority)
- 0)))))
- (mapcar (lambda (overl)
- (ediff-set-overlay-face overl face)
- (ediff-overlay-put overl 'priority priority))
- fine-diff-vector)))
+ )))
+ (dolist (overl fine-diff-vector)
+ (ediff-set-overlay-face overl face))))
;; Set overlays over the regions that denote delimiters
(defun ediff-set-fine-overlays-for-combined-merge (diff-list reg-num)
=== modified file 'lisp/vc/ediff-init.el'
--- a/lisp/vc/ediff-init.el 2014-02-16 03:09:27 +0000
+++ b/lisp/vc/ediff-init.el 2014-04-10 19:15:01 +0000
@@ -707,9 +707,6 @@
;; List of difference overlays disturbed by working with the current diff.
(defvar ediff-disturbed-overlays nil "")
-;; Priority of non-selected overlays.
-(defvar ediff-shadow-overlay-priority 100 "")
-
(defcustom ediff-version-control-package 'vc
"Version control package used.
Currently, Ediff supports vc.el, rcs.el, pcl-cvs.el, and generic-sc.el. The
@@ -1329,34 +1326,6 @@
(ediff-defvar-local ediff-current-diff-overlay-Ancestor nil
"Overlay for the current difference region in the ancestor buffer.")
-;; Compute priority of a current ediff overlay.
-(defun ediff-highest-priority (start end buffer)
- (let ((pos (max 1 (1- start)))
- ovr-list)
- (if (featurep 'xemacs)
- (1+ ediff-shadow-overlay-priority)
- (ediff-with-current-buffer buffer
- (while (< pos (min (point-max) (1+ end)))
- (setq ovr-list (append (overlays-at pos) ovr-list))
- (setq pos (next-overlay-change pos)))
- (+ 1 ediff-shadow-overlay-priority
- (apply 'max
- (cons
- 1
- (mapcar
- (lambda (ovr)
- (if (and ovr
- ;; exclude ediff overlays from priority
- ;; calculation, or else priority will keep
- ;; increasing
- (null (ediff-overlay-get ovr 'ediff))
- (null (ediff-overlay-get ovr 'ediff-diff-num)))
- ;; use the overlay priority or 0
- (or (ediff-overlay-get ovr 'priority) 0)
- 0))
- ovr-list))))))))
-
-
(defvar ediff-toggle-read-only-function 'toggle-read-only
"Function to be used to toggle read-only status of the buffer.
If nil, Ediff tries using the command bound to C-x C-q.")
=== modified file 'lisp/vc/ediff-util.el'
--- a/lisp/vc/ediff-util.el 2014-01-01 07:43:34 +0000
+++ b/lisp/vc/ediff-util.el 2014-04-10 19:15:01 +0000
@@ -3023,8 +3023,6 @@
(if (featurep 'xemacs)
(ediff-move-overlay current-diff-overlay begin end-hilit)
(ediff-move-overlay current-diff-overlay begin end-hilit buff))
- (ediff-overlay-put current-diff-overlay 'priority
- (ediff-highest-priority begin end-hilit buff))
(ediff-overlay-put current-diff-overlay 'ediff-diff-num n)
;; unhighlight the background overlay for diff n so it won't
=== modified file 'make-dist'
--- a/make-dist 2014-04-03 01:16:18 +0000
+++ b/make-dist 2014-04-11 06:43:20 +0000
@@ -385,7 +385,8 @@
ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src
ln ChangeLog Makefile.in README ../${tempdir}/lib-src
ln grep-changelog rcs2log ../${tempdir}/lib-src
- ln makefile.w32-in ../${tempdir}/lib-src)
+ ln makefile.w32-in ../${tempdir}/lib-src
+ ln update-game-score.exe.manifest ../${tempdir}/lib-src)
echo "Making links to \`m4'"
(cd m4
@@ -451,7 +452,7 @@
echo "Making links to \`admin' and its subdirectories"
for f in `find admin -type f`; do
case $f in
- admin/unidata/Makefile) continue ;;
+ */Makefile) [ -f $f.in ] && continue ;;
esac
ln $f $tempdir/$f
done
=== modified file 'nt/ChangeLog'
--- a/nt/ChangeLog 2014-04-07 21:19:31 +0000
+++ b/nt/ChangeLog 2014-04-11 06:43:20 +0000
@@ -1,3 +1,7 @@
+2014-04-11 Ken Brown <address@hidden>
+
+ * emacs.rc: Revert last change.
+
2014-04-07 Ken Brown <address@hidden>
* emacs.rc: Don't use manifest on Cygwin. (Bug#17176)
=== modified file 'nt/emacs.rc'
--- a/nt/emacs.rc 2014-04-07 20:54:16 +0000
+++ b/nt/emacs.rc 2014-04-11 06:43:20 +0000
@@ -1,12 +1,10 @@
Emacs ICON icons/emacs.ico
32649 CURSOR icons/hand.cur
-#ifndef __CYGWIN__
-#ifdef WIN64
+#if defined (WIN64) || defined (__x86_64__)
1 24 "emacs-x64.manifest"
#else
1 24 "emacs-x86.manifest"
#endif
-#endif
#ifndef VS_VERSION_INFO
#define VS_VERSION_INFO 1
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-04-10 00:05:34 +0000
+++ b/src/ChangeLog 2014-04-11 06:43:20 +0000
@@ -1,3 +1,11 @@
+2014-04-11 Glenn Morris <address@hidden>
+
+ * keyboard.c (Fopen_dribble_file): Make file private. (Bug#17187)
+
+2014-04-11 Ken Brown <address@hidden>
+
+ * Makefile.in (EMACS_MANIFEST): Revert last change.
+
2014-04-10 Daniel Colascione <address@hidden>
* puresize.h (BASE_PURESIZE): Increase.
=== modified file 'src/Makefile.in'
--- a/src/Makefile.in 2014-04-03 19:10:35 +0000
+++ b/src/Makefile.in 2014-04-09 21:16:37 +0000
@@ -259,7 +259,7 @@
## emacs.res if HAVE_W32
EMACSRES = @EMACSRES@
-## emacs-*.manifest if WINDOWSNT
+## emacs-*.manifest if HAVE_W32
EMACS_MANIFEST = @EMACS_MANIFEST@
## If HAVE_W32, compiler arguments for including
## the resource file in the binary.
=== modified file 'src/keyboard.c'
--- a/src/keyboard.c 2014-04-09 13:21:30 +0000
+++ b/src/keyboard.c 2014-04-11 06:43:20 +0000
@@ -20,6 +20,7 @@
#include <config.h>
#include "sysstdio.h"
+#include <sys/stat.h>
#include "lisp.h"
#include "termchar.h"
@@ -10082,8 +10083,18 @@
}
if (!NILP (file))
{
+ int fd;
file = Fexpand_file_name (file, Qnil);
- dribble = emacs_fopen (SSDATA (file), "w");
+ /* This isn't robust, since eg file could be created after we
+ check whether it exists but before emacs_open.
+ Feel free to improve it, but this is not critical. (Bug#17187) */
+ if (! NILP (Ffile_exists_p (file)))
+ {
+ if (chmod (SSDATA (file), 0600) < 0)
+ report_file_error ("Doing chmod", file);
+ }
+ fd = emacs_open (SSDATA (file), O_WRONLY | O_CREAT | O_TRUNC, 0600);
+ dribble = fd < 0 ? 0 : fdopen (fd, "w");
if (dribble == 0)
report_file_error ("Opening dribble", file);
}
=== modified file 'test/ChangeLog'
--- a/test/ChangeLog 2014-04-09 16:58:08 +0000
+++ b/test/ChangeLog 2014-04-11 06:43:20 +0000
@@ -1,3 +1,9 @@
+2014-04-11 Paul Eggert <address@hidden>
+
+ * automated/electric-tests.el: Fix spelling error in test name.
+ (whitespace-skipping-for-quotes-not-outside):
+ Rename from whitespace-skipping-for-quotes-not-ouside.
+
2014-04-09 Daniel Colascione <address@hidden>
* automated/syntax-tests.el: New file.
=== modified file 'test/automated/electric-tests.el'
--- a/test/automated/electric-tests.el 2014-04-09 03:37:56 +0000
+++ b/test/automated/electric-tests.el 2014-04-11 06:43:20 +0000
@@ -383,7 +383,7 @@
:test-in-code nil
:test-in-comments t)
-(define-electric-pair-test whitespace-skipping-for-quotes-not-ouside
+(define-electric-pair-test whitespace-skipping-for-quotes-not-outside
" \" \"" "\"-----" :expected-string "\"\" \" \""
:expected-point 2
:bindings '((electric-pair-skip-whitespace . chomp))
=== modified file 'test/indent/pascal.pas'
--- a/test/indent/pascal.pas 2014-01-10 07:10:37 +0000
+++ b/test/indent/pascal.pas 2014-04-10 13:56:28 +0000
@@ -29,6 +29,7 @@
// Free-pascal style comment.
var x:Char = 12 /* 45; // This /* does not start a comment.
var x:Char = (/ 4); // This (/ does not start a comment.
+var a_to_b : integer; // 'to' should not be highlighted
program CRTDemo;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r116967: Merge from emacs-24; up to r116940,
Glenn Morris <=