Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 103691. ------------------------------------------------------------ revno: 103691 committer: Chong Yidong branch nick: trunk timestamp: Sat 2011-03-19 18:07:41 -0400 message: Add error for dired-create-directory on existing file (Bug#8246). * lisp/dired-aux.el (dired-create-directory): Signal an error if the directory already exists. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-19 21:37:21 +0000 +++ lisp/ChangeLog 2011-03-19 22:07:41 +0000 @@ -1,5 +1,8 @@ 2011-03-19 Chong Yidong + * dired-aux.el (dired-create-directory): Signal an error if the + directory already exists (Bug#8246). + * facemenu.el (list-colors-display): Call list-faces-display inside with-help-window. (list-colors-print): Use display property to align the final === modified file 'lisp/dired-aux.el' --- lisp/dired-aux.el 2011-02-28 01:31:20 +0000 +++ lisp/dired-aux.el 2011-03-19 22:07:41 +0000 @@ -1638,11 +1638,14 @@ ;;;###autoload (defun dired-create-directory (directory) - "Create a directory called DIRECTORY." + "Create a directory called DIRECTORY. +If DIRECTORY already exists, signal an error." (interactive (list (read-file-name "Create directory: " (dired-current-directory)))) (let* ((expanded (directory-file-name (expand-file-name directory))) (try expanded) new) + (if (file-exists-p expanded) + (error "Cannot create directory %s: file exists" expanded)) ;; Find the topmost nonexistent parent dir (variable `new') (while (and try (not (file-exists-p try)) (not (equal new try))) (setq new try === modified file 'lisp/dired.el' --- lisp/dired.el 2011-03-05 21:56:00 +0000 +++ lisp/dired.el 2011-03-19 22:07:41 +0000 @@ -3627,7 +3627,7 @@ ;;;;;; dired-run-shell-command dired-do-shell-command dired-do-async-shell-command ;;;;;; dired-clean-directory dired-do-print dired-do-touch dired-do-chown ;;;;;; dired-do-chgrp dired-do-chmod dired-compare-directories dired-backup-diff -;;;;;; dired-diff) "dired-aux" "dired-aux.el" "154cdfbf451aedec60c5012b625ff329") +;;;;;; dired-diff) "dired-aux" "dired-aux.el" "2d805d6766bd7970cd446413b4ed4ce0") ;;; Generated autoloads from dired-aux.el (autoload 'dired-diff "dired-aux" "\ @@ -3858,6 +3858,7 @@ (autoload 'dired-create-directory "dired-aux" "\ Create a directory called DIRECTORY. +If DIRECTORY already exists, signal an error. \(fn DIRECTORY)" t nil) ------------------------------------------------------------ revno: 103690 committer: Chong Yidong branch nick: trunk timestamp: Sat 2011-03-19 17:37:21 -0400 message: Fix facemenu to populate buffer inside the with-help-window call. See http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg01193.html * facemenu.el (list-colors-display): Call list-faces-display from inside with-help-window. (list-colors-print): Use display property to align the final column, instead of checking window-width. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-19 18:49:31 +0000 +++ lisp/ChangeLog 2011-03-19 21:37:21 +0000 @@ -1,3 +1,10 @@ +2011-03-19 Chong Yidong + + * facemenu.el (list-colors-display): Call list-faces-display + inside with-help-window. + (list-colors-print): Use display property to align the final + column, instead of checking window-width. + 2011-03-19 Eli Zaretskii * emerge.el (emerge-metachars): Separate value for ms-dos and === modified file 'lisp/facemenu.el' --- lisp/facemenu.el 2011-02-27 23:53:41 +0000 +++ lisp/facemenu.el 2011-03-19 21:37:21 +0000 @@ -567,18 +567,12 @@ (with-help-window buffer-name (with-current-buffer standard-output (erase-buffer) + (list-colors-print list callback) + (set-buffer-modified-p nil) (setq truncate-lines t))) - (let ((buf (get-buffer buffer-name)) - (inhibit-read-only t)) - ;; Display buffer before generating content, to allow - ;; `list-colors-print' to get the right window-width. - (with-selected-window (or (get-buffer-window buf t) (selected-window)) - (with-current-buffer buf - (list-colors-print list callback) - (set-buffer-modified-p nil))) - (when callback - (pop-to-buffer buf) - (message "Click on a color to select it.")))) + (when callback + (pop-to-buffer buffer-name) + (message "Click on a color to select it."))) (defun list-colors-print (list &optional callback) (let ((callback-fn @@ -595,30 +589,19 @@ (let* ((opoint (point)) (color-values (color-values (car color))) (light-p (>= (apply 'max color-values) - (* (car (color-values "white")) .5))) - (max-len (max (- (window-width) 33) 20))) + (* (car (color-values "white")) .5)))) (insert (car color)) (indent-to 22) (put-text-property opoint (point) 'face `(:background ,(car color))) (put-text-property (prog1 (point) (insert " ") - (if (cdr color) - ;; Insert as many color names as possible, fitting max-len. - (let ((names (list (car color))) - (others (cdr color)) - (len (length (car color))) - newlen) - (while (and others - (< (setq newlen (+ len 2 (length (car others)))) - max-len)) - (setq len newlen) - (push (pop others) names)) - (insert (mapconcat 'identity (nreverse names) ", "))) - (insert (car color)))) + ;; Insert all color names. + (insert (mapconcat 'identity color ","))) (point) 'face (list :foreground (car color))) - (indent-to (max (- (window-width) 8) 44)) + (insert (propertize " " 'display '(space :align-to (- right 9)))) + (insert " ") (insert (propertize (apply 'format "#%02x%02x%02x" (mapcar (lambda (c) (lsh c -8)) ------------------------------------------------------------ revno: 103689 [merge] committer: Chong Yidong branch nick: trunk timestamp: Sat 2011-03-19 14:50:29 -0400 message: Merge changes from emacs-23 branch diff: === modified file 'configure.in' --- configure.in 2011-03-12 19:19:47 +0000 +++ configure.in 2011-03-19 18:49:31 +0000 @@ -2257,7 +2257,7 @@ dnl if -lfreetype is not specified. dnl The following is needed to set FREETYPE_LIBS. PKG_CHECK_MODULES(FREETYPE, freetype2, HAVE_FREETYPE=yes, - HAVE_FREETYPE=no) + HAVE_FREETYPE=no) test "$HAVE_FREETYPE" = "no" && AC_MSG_ERROR(libxft requires libfreetype) fi === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-03-12 19:19:47 +0000 +++ doc/lispref/ChangeLog 2011-03-19 18:49:31 +0000 @@ -1,3 +1,11 @@ +2011-03-16 Stefan Monnier + + * strings.texi (String Conversion): Don't mention + string-make-(uni|multi)byte (bug#8262). + * nonascii.texi (Converting Representations): Fix up range. + * keymaps.texi (Key Binding Commands): Update code point, avoid + "unibyte character" and remove mention of unibyte bindings. + 2011-03-10 Eli Zaretskii * modes.texi (Operator Precedence Grammars): Don't use characters === modified file 'doc/lispref/keymaps.texi' --- doc/lispref/keymaps.texi 2011-02-19 19:40:59 +0000 +++ doc/lispref/keymaps.texi 2011-03-19 18:49:31 +0000 @@ -1705,15 +1705,11 @@ @noindent and your language environment is multibyte Latin-1, these commands -actually bind the multibyte character with code 2294, not the unibyte -Latin-1 character with code 246 (@kbd{M-v}). In order to use this -binding, you need to enter the multibyte Latin-1 character as keyboard -input. One way to do this is by using an appropriate input method -(@pxref{Input Methods, , Input Methods, emacs, The GNU Emacs Manual}). - - If you want to use a unibyte character in the key binding, you can -construct the key sequence string using @code{multibyte-char-to-unibyte} -or @code{string-make-unibyte} (@pxref{Converting Representations}). +actually bind the multibyte character with code 246, not the byte +code 246 (@kbd{M-v}) sent by a Latin-1 terminal. In order to use this +binding, you need to teach Emacs how to decode the keyboard by using an +appropriate input method (@pxref{Input Methods, , Input Methods, emacs, The GNU +Emacs Manual}). @deffn Command global-set-key key binding This function sets the binding of @var{key} in the current global map === modified file 'doc/lispref/nonascii.texi' --- doc/lispref/nonascii.texi 2011-01-25 04:08:28 +0000 +++ doc/lispref/nonascii.texi 2011-03-19 18:49:31 +0000 @@ -167,7 +167,7 @@ user that cannot be overridden automatically. Converting unibyte text to multibyte text leaves @acronym{ASCII} -characters unchanged, and converts bytes with codes 128 through 159 to +characters unchanged, and converts bytes with codes 128 through 255 to the multibyte representation of raw eight-bit bytes. Converting multibyte text to unibyte converts all @acronym{ASCII} === modified file 'doc/lispref/strings.texi' --- doc/lispref/strings.texi 2011-01-25 04:08:28 +0000 +++ doc/lispref/strings.texi 2011-03-19 18:49:31 +0000 @@ -554,8 +554,8 @@ @code{prin1-to-string} (@pxref{Output Functions}) can also convert Lisp objects into strings. @code{read-from-string} (@pxref{Input Functions}) can ``convert'' a string representation of a Lisp object -into an object. The functions @code{string-make-multibyte} and -@code{string-make-unibyte} convert the text representation of a string +into an object. The functions @code{string-to-multibyte} and +@code{string-to-unibyte} convert the text representation of a string (@pxref{Converting Representations}). @xref{Documentation}, for functions that produce textual descriptions === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-19 18:27:55 +0000 +++ lisp/ChangeLog 2011-03-19 18:49:31 +0000 @@ -1,3 +1,22 @@ +2011-03-19 Eli Zaretskii + + * emerge.el (emerge-metachars): Separate value for ms-dos and + windows-nt systems. + (emerge-protect-metachars): Quote correctly for ms-dos and + windows-nt systems. + +2011-03-19 Ralph Schleicher + + * info.el (info-initialize): Replace all uses of `:' with + path-separator for compatibility with non-Unix systems. + Cache quoting of path-separator. (Bug#8258) + +2011-03-19 Juanma Barranquero + + * avoid.el (mouse-avoidance-mode, mouse-avoidance-nudge-dist) + (mouse-avoidance-threshold, mouse-avoidance-banish-destination) + (mouse-avoidance-mode): Fix typos in docstrings. + 2011-03-19 Chong Yidong * startup.el (package-subdirectory-regexp): Move from package.el. === modified file 'lisp/avoid.el' --- lisp/avoid.el 2011-03-10 02:14:55 +0000 +++ lisp/avoid.el 2011-03-19 18:49:31 +0000 @@ -76,7 +76,7 @@ ;;;###autoload (defcustom mouse-avoidance-mode nil - "Activate mouse avoidance mode. + "Activate Mouse Avoidance mode. See function `mouse-avoidance-mode' for possible values. Setting this variable directly does not take effect; use either \\[customize] or the function `mouse-avoidance-mode'." @@ -85,8 +85,7 @@ (mouse-avoidance-mode (or value 'none))) :initialize 'custom-initialize-default :type '(choice (const :tag "none" nil) (const banish) (const jump) - (const animate) (const exile) (const proteus) - ) + (const animate) (const exile) (const proteus)) :group 'avoid :require 'avoid :version "20.3") @@ -94,7 +93,7 @@ (defcustom mouse-avoidance-nudge-dist 15 "Average distance that mouse will be moved when approached by cursor. -Only applies in Mouse-Avoidance mode `jump' and its derivatives. +Only applies in Mouse Avoidance mode `jump' and its derivatives. For best results make this larger than `mouse-avoidance-threshold'." :type 'integer :group 'avoid) @@ -112,7 +111,7 @@ (defcustom mouse-avoidance-threshold 5 "Mouse-pointer's flight distance. If the cursor gets closer than this, the mouse pointer will move away. -Only applies in mouse-avoidance-modes `animate' and `jump'." +Only applies in Mouse Avoidance modes `animate' and `jump'." :type 'integer :group 'avoid) @@ -183,7 +182,7 @@ mouse-avoidance-threshold)))))) (defun mouse-avoidance-banish-destination () - "The position to which Mouse-Avoidance mode `banish' moves the mouse. + "The position to which Mouse Avoidance mode `banish' moves the mouse. You can redefine this if you want the mouse banished to a different corner." (let* ((pos (window-edges))) (cons (- (nth 2 pos) 2) @@ -333,7 +332,7 @@ ;;;###autoload (defun mouse-avoidance-mode (&optional mode) - "Set cursor avoidance mode to MODE. + "Set Mouse Avoidance mode to MODE. MODE should be one of the symbols `banish', `exile', `jump', `animate', `cat-and-mouse', `proteus', or `none'. @@ -353,7 +352,7 @@ Whenever the mouse is moved, the frame is also raised. -\(see `mouse-avoidance-threshold' for definition of \"too close\", +\(See `mouse-avoidance-threshold' for definition of \"too close\", and `mouse-avoidance-nudge-dist' and `mouse-avoidance-nudge-var' for definition of \"random distance\".)" (interactive === modified file 'lisp/info.el' --- lisp/info.el 2011-01-25 04:08:28 +0000 +++ lisp/info.el 2011-03-19 18:49:31 +0000 @@ -594,15 +594,15 @@ (defun info-initialize () "Initialize `Info-directory-list', if that hasn't been done yet." (unless Info-directory-list - (let ((path (getenv "INFOPATH"))) + (let ((path (getenv "INFOPATH")) + (sep (regexp-quote path-separator))) (setq Info-directory-list (prune-directory-list (if path - (if (string-match ":\\'" path) - (append (split-string (substring path 0 -1) - (regexp-quote path-separator)) + (if (string-match-p (concat sep "\\'") path) + (append (split-string (substring path 0 -1) sep) (Info-default-dirs)) - (split-string path (regexp-quote path-separator))) + (split-string path sep)) (Info-default-dirs))))))) ;;;###autoload === modified file 'lisp/vc/emerge.el' --- lisp/vc/emerge.el 2011-03-05 21:56:00 +0000 +++ lisp/vc/emerge.el 2011-03-19 18:49:31 +0000 @@ -3176,21 +3176,26 @@ ;; Metacharacters that have to be protected from the shell when executing ;; a diff/diff3 command. -(defcustom emerge-metachars "[ \t\n!\"#$&'()*;<=>?[\\^`{|~]" - "Characters that must be quoted with \\ when used in a shell command line. +(defcustom emerge-metachars + (if (memq system-type '(ms-dos windows-nt)) + "[ \t\"<>|?*^&=]" + "[ \t\n!\"#$&'()*;<=>?[\\^`{|~]") + "Characters that must be quoted when used in a shell command line. More precisely, a [...] regexp to match any one such character." :type 'regexp :group 'emerge) ;; Quote metacharacters (using \) when executing a diff/diff3 command. (defun emerge-protect-metachars (s) - (let ((limit 0)) - (while (string-match emerge-metachars s limit) - (setq s (concat (substring s 0 (match-beginning 0)) - "\\" - (substring s (match-beginning 0)))) - (setq limit (1+ (match-end 0))))) - s) + (if (memq system-type '(ms-dos windows-nt)) + (shell-quote-argument s) + (let ((limit 0)) + (while (string-match emerge-metachars s limit) + (setq s (concat (substring s 0 (match-beginning 0)) + "\\" + (substring s (match-beginning 0)))) + (setq limit (1+ (match-end 0))))) + s)) (provide 'emerge) === modified file 'src/ChangeLog' --- src/ChangeLog 2011-03-19 03:22:14 +0000 +++ src/ChangeLog 2011-03-19 18:49:31 +0000 @@ -1,5 +1,10 @@ 2011-03-19 Juanma Barranquero + * xfaces.c (Fx_load_color_file): + Read color file from absolute filename (bug#8250). + +2011-03-19 Juanma Barranquero + * makefile.w32-in: Update dependencies. 2011-03-17 Eli Zaretskii === modified file 'src/xfaces.c' --- src/xfaces.c 2011-03-09 06:29:34 +0000 +++ src/xfaces.c 2011-03-19 18:49:31 +0000 @@ -6297,7 +6297,7 @@ CHECK_STRING (filename); abspath = Fexpand_file_name (filename, Qnil); - fp = fopen (SDATA (filename), "rt"); + fp = fopen (SDATA (abspath), "rt"); if (fp) { char buf[512]; ------------------------------------------------------------ revno: 103688 committer: Chong Yidong branch nick: trunk timestamp: Sat 2011-03-19 14:27:55 -0400 message: Fix tar package handling, and clean up package-subdirectory-regexp usage. * lisp/startup.el (package-subdirectory-regexp): Move from package.el. Omit \\` and \\', and let callers add them. * lisp/emacs-lisp/package.el (package-strip-version) (package-load-all-descriptors): Add \\` and \\' to package-subdirectory-regexp before using it. (package-untar-buffer): New arg DIR; ensure that file untars only into this expected directory. Remove superfluous delete-region. (package-unpack): Caller changed. (package-tar-file-info): Use package-subdirectory-regexp. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-03-18 19:52:05 +0000 +++ lisp/ChangeLog 2011-03-19 18:27:55 +0000 @@ -1,3 +1,16 @@ +2011-03-19 Chong Yidong + + * startup.el (package-subdirectory-regexp): Move from package.el. + Omit \\` and \\', and let callers add them. + + * emacs-lisp/package.el (package-strip-version) + (package-load-all-descriptors): Add \\` and \\' to + package-subdirectory-regexp before using it. + (package-untar-buffer): New arg DIR; ensure that file untars only + into this expected directory. Remove superfluous delete-region. + (package-unpack): Caller changed. + (package-tar-file-info): Use package-subdirectory-regexp. + 2011-03-18 Stefan Monnier * vc/diff-mode.el (diff-mode-map): Shadow problematic bindings from === modified file 'lisp/emacs-lisp/package.el' --- lisp/emacs-lisp/package.el 2011-03-10 23:40:46 +0000 +++ lisp/emacs-lisp/package.el 2011-03-19 18:27:55 +0000 @@ -319,12 +319,6 @@ The inner alist is keyed by version.") (put 'package-obsolete-alist 'risky-local-variable t) -(defconst package-subdirectory-regexp - "\\`\\([^.].*?\\)-\\([0-9]+\\(?:[.][0-9]+\\|\\(?:pre\\|beta\\|alpha\\)[0-9]+\\)*\\)\\'" - "Regular expression matching the name of a package subdirectory. -The first subexpression is the package name. -The second subexpression is the version string.") - (defun package-version-join (vlist) "Return the version string corresponding to the list VLIST. This is, approximately, the inverse of `version-to-list'. @@ -357,7 +351,7 @@ (defun package-strip-version (dirname) "Strip the version from a combined package name and version. E.g., if given \"quux-23.0\", will return \"quux\"" - (if (string-match package-subdirectory-regexp dirname) + (if (string-match (concat "\\`" package-subdirectory-regexp "\\'") dirname) (match-string 1 dirname))) (defun package-load-descriptor (dir package) @@ -382,12 +376,13 @@ description file containing a call to `define-package', which updates `package-alist' and `package-obsolete-alist'." (let ((all (memq 'all package-load-list)) + (regexp (concat "\\`" package-subdirectory-regexp "\\'")) name version force) (dolist (dir (cons package-user-dir package-directory-list)) (when (file-directory-p dir) (dolist (subdir (directory-files dir)) (when (and (file-directory-p (expand-file-name subdir dir)) - (string-match package-subdirectory-regexp subdir)) + (string-match regexp subdir)) (setq name (intern (match-string 1 subdir)) version (match-string 2 subdir) force (assq name package-load-list)) @@ -579,30 +574,29 @@ (package-autoload-ensure-default-file generated-autoload-file)) (update-directory-autoloads pkg-dir))) -(defun package-untar-buffer () +(defvar tar-parse-info) +(declare-function tar-untar-buffer "tar-mode" ()) + +(defun package-untar-buffer (dir) "Untar the current buffer. -This uses `tar-untar-buffer' if it is available. -Otherwise it uses an external `tar' program. -`default-directory' should be set by the caller." +This uses `tar-untar-buffer' from Tar mode. All files should +untar into a directory named DIR; otherwise, signal an error." (require 'tar-mode) - (if (fboundp 'tar-untar-buffer) - (progn - ;; tar-mode messes with narrowing, so we just let it have the - ;; whole buffer to play with. - (delete-region (point-min) (point)) - (tar-mode) - (tar-untar-buffer)) - ;; FIXME: check the result. - (call-process-region (point) (point-max) "tar" nil '(nil nil) nil - "xf" "-"))) + (tar-mode) + ;; Make sure everything extracts into DIR. + (let ((regexp (concat "\\`" (regexp-quote dir) "/"))) + (dolist (tar-data tar-parse-info) + (unless (string-match regexp (aref tar-data 2)) + (error "Package does not untar cleanly into directory %s/" dir)))) + (tar-untar-buffer)) (defun package-unpack (name version) - (let ((pkg-dir (expand-file-name (concat (symbol-name name) "-" version) - package-user-dir))) + (let* ((dirname (concat (symbol-name name) "-" version)) + (pkg-dir (expand-file-name dirname package-user-dir))) (make-directory package-user-dir t) ;; FIXME: should we delete PKG-DIR if it exists? (let* ((default-directory (file-name-as-directory package-user-dir))) - (package-untar-buffer) + (package-untar-buffer dirname) (package-generate-autoloads (symbol-name name) pkg-dir) (let ((load-path (cons pkg-dir load-path))) (byte-recompile-directory pkg-dir 0 t))))) @@ -942,7 +936,8 @@ The return result is a vector like `package-buffer-info'." (let ((default-directory (file-name-directory file)) (file (file-name-nondirectory file))) - (unless (string-match "^\\(.+\\)-\\([0-9.]+\\)\\.tar$" file) + (unless (string-match (concat "\\`" package-subdirectory-regexp "\\.tar\\'") + file) (error "Invalid package name `%s'" file)) (let* ((pkg-name (match-string-no-properties 1 file)) (pkg-version (match-string-no-properties 2 file)) === modified file 'lisp/startup.el' --- lisp/startup.el 2011-03-16 02:13:31 +0000 +++ lisp/startup.el 2011-03-19 18:27:55 +0000 @@ -392,6 +392,15 @@ :type 'directory :initialize 'custom-initialize-delay) +(defconst package-subdirectory-regexp + "\\([^.].*?\\)-\\([0-9]+\\(?:[.][0-9]+\\|\\(?:pre\\|beta\\|alpha\\)[0-9]+\\)*\\)" + "Regular expression matching the name of a package subdirectory. +The first subexpression is the package name. +The second subexpression is the version string. + +The regexp should not contain a starting \"\\`\" or a trailing + \"\\'\"; those are added automatically by callers.") + (defun normal-top-level-add-subdirs-to-load-path () "Add all subdirectories of current directory to `load-path'. More precisely, this uses only the subdirectories whose names @@ -1194,9 +1203,9 @@ (when (file-directory-p dir) (dolist (subdir (directory-files dir)) (when (and (file-directory-p (expand-file-name subdir dir)) - ;; package-subdirectory-regexp from package.el - (string-match "\\`\\([^.].*?\\)-\\([0-9]+\\(?:[.][0-9]+\\|\\(?:pre\\|beta\\|alpha\\)[0-9]+\\)*\\)\\'" - subdir)) + (string-match + (concat "\\`" package-subdirectory-regexp "\\'") + subdir)) (throw 'package-dir-found t))))))) (package-initialize)) ------------------------------------------------------------ revno: 103687 committer: Juanma Barranquero branch nick: trunk timestamp: Sat 2011-03-19 04:58:45 +0100 message: Fix typos. diff: === modified file 'ChangeLog' --- ChangeLog 2011-03-13 17:39:04 +0000 +++ ChangeLog 2011-03-19 03:58:45 +0000 @@ -59,7 +59,7 @@ 2011-02-21 Christoph Scholtes - * lib/makefile.w32-in: ($(BLD)/md5.$(O)): Added dependency on + * lib/makefile.w32-in ($(BLD)/md5.$(O)): Added dependency on $(EMACS_ROOT)/nt/inc/stdint.h. 2011-02-21 Eli Zaretskii @@ -98,7 +98,7 @@ way to test this so I left it alone. * configure: Regenerate. -2011-02-20 Christoph Scholtes +2011-02-20 Christoph Scholtes * lib/makefile.w32-in ($(BLD)/md5.$(O)): New recipe, moved from src/makefile.w32-in. @@ -961,7 +961,7 @@ 2010-06-28 Jan Djärv - * configure.in: Add --with-x-toolkit=gtk3. Remove HAVE_GTK_MULTIDISPLAY, + * configure.in: Add --with-x-toolkit=gtk3. Remove HAVE_GTK_MULTIDISPLAY, check for gtk_file_chooser_dialog_new, and HAVE_GTK_FILE_BOTH (implied by minimum required Gtk+ 2.6). Add checks for functions introduced in Gtk+ 2.14 or newer (bug#6505). === modified file 'etc/ChangeLog' --- etc/ChangeLog 2011-03-16 02:13:31 +0000 +++ etc/ChangeLog 2011-03-19 03:58:45 +0000 @@ -24,15 +24,15 @@ 2011-02-17 Ken Manheimer * etc/images/icons/allout-widgets/dark-bg, - etc/images/icons/allout-widgets/light-bg, - encrypted-locked.{xpm,png}, unlocked-encrypted.{xpm,png}: + * etc/images/icons/allout-widgets/light-bg, + * encrypted-locked.{xpm,png}, unlocked-encrypted.{xpm,png}: Reorganize icon directories and files to reconcile against windows short-filename clashes. 2011-02-16 Ken Manheimer * etc/images/icons/allout-widgets-dark-bg, - etc/images/icons/allout-widgets-light-bg: Icons for new + * etc/images/icons/allout-widgets-light-bg: Icons for new allout-widgets.el. * etc/images/icons/README: Include coypright and GPL 3 license for === modified file 'etc/NEWS' --- etc/NEWS 2011-03-16 02:13:31 +0000 +++ etc/NEWS 2011-03-19 03:58:45 +0000 @@ -185,8 +185,8 @@ consider if it is still appropriate to add it in the noninteractive case. ** New scrolling commands `scroll-up-command' and `scroll-down-command' -(bound to C-v/[next] and M-v/[prior]) does not signal errors at top/bottom -of buffer at first key-press (instead moves to top/bottom of buffer) +(bound to C-v/[next] and M-v/[prior]) do not signal errors at top/bottom +of buffer at first key-press (instead move to top/bottom of buffer) when a new variable `scroll-error-top-bottom' is non-nil. ** New scrolling commands `scroll-up-line' and `scroll-down-line' @@ -365,7 +365,7 @@ ** Archive Mode has basic support to browse 7z archives. ** browse-url has gotten a new variable that is used for mailto: URLs, - `browse-url-mailto-function', which defaults to `browse-url-mail'. +`browse-url-mailto-function', which defaults to `browse-url-mail'. ** Directory local variables can apply to file-less buffers, in certain modes (eg dired, vc-dir, log-edit). For example, adding @@ -702,15 +702,14 @@ programmer-visible consequences. ** Passing a nil argument to a minor mode function now turns the mode - ON unconditionally. +ON unconditionally. ** During startup, Emacs no longer adds entries for `menu-bar-lines' -and `tool-bar-lines' to `default-frame-alist' and -`initial-frame-alist'. With these alist entries omitted, `make-frame' -checks the value of the variable `menu-bar-mode'/`tool-bar-mode' to -determine whether to create a menu-bar or tool-bar, respectively. -If the alist entries are added, they override the value of -`menu-bar-mode'/`tool-bar-mode'. +and `tool-bar-lines' to `default-frame-alist' and `initial-frame-alist'. +With these alist entries omitted, `make-frame' checks the value of the +variable `menu-bar-mode'/`tool-bar-mode' to determine whether to create +a menu-bar or tool-bar, respectively. If the alist entries are added, +they override the value of `menu-bar-mode'/`tool-bar-mode'. ** Regions created by mouse dragging are now normal active regions, similar to the ones created by shift-selection. In previous Emacs @@ -830,13 +829,13 @@ * Changes in Emacs 24.1 on non-free operating systems -** New configure.bat option --enable-checking builds emacs with extra +** New configure.bat option --enable-checking builds Emacs with extra runtime checks. ** New configure.bat option --distfiles to specify files to be -included in binary distribution +included in binary distribution. -** New make target `dist' to create binary distribution for MS Windows +** New make target `dist' to create binary distribution for MS Windows. ---------------------------------------------------------------------- ------------------------------------------------------------ Use --include-merges or -n0 to see merged revisions.