]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from trunk.
authorMartin Rudalics <rudalics@gmx.at>
Fri, 25 Feb 2011 14:04:43 +0000 (15:04 +0100)
committerMartin Rudalics <rudalics@gmx.at>
Fri, 25 Feb 2011 14:04:43 +0000 (15:04 +0100)
1  2 
lisp/ChangeLog
lisp/dired.el
lisp/files.el
lisp/gnus/ChangeLog
lisp/mail/rmail.el
src/ChangeLog
src/print.c
src/xdisp.c

diff --cc lisp/ChangeLog
index da845ac265a6192daa59fd8a46e2b3e12696acd0,c44c491cad07f4e971bef9dfbaff8d90426901d4..4de9272d9017977de575e2b58bd733dd6cf10b6f
+ 2011-02-24  Glenn Morris  <rgm@gnu.org>
+       * files-x.el (modify-dir-local-variable): Handle dir-locals from
+       the cache, and from non-file sources.
+       * help-fns.el (describe-variable): Return consistent results when a
+       dir-local from a file came from the cache or did not.  (Bug#8095)
+       If a dir-local has no associated file, say it came from a "directory".
+       * files.el (hack-dir-local-variables): Fix setting of `dir-name'.
+       (hack-local-variables-confirm, hack-local-variables-filter): Doc fix.
+       * files.el (dir-locals-find-file): Doc fix.
+       Fix the check for cache elements that have no associated file,
+       and the mtime check for those that do.  (Bug#8095)
+       * dired-x.el (dired-hack-local-variables):
+       Handle interrupts during hacking local variables.  (Bug#5216)
+       * emacs-lisp/autoload.el (autoload-save-buffers)
+       (autoload-find-destination, update-directory-autoloads):
+       Avoid prompts when updating autoloads.
+ 2011-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * emacs-lisp/bytecomp.el (byte-compile-disable-print-circle): Obsolete.
+ 2011-02-23  Kenichi Handa  <handa@m17n.org>
+       * mail/rmailmm.el (rmail-mime-process-multipart): Do not signal an
+       error when a multipart boundary in the nested multipart is found.
+       * mail/rmail.el (rmail-start-mail): Decode "encoded-words" of
+       header components.
+ 2011-02-23  Glenn Morris  <rgm@gnu.org>
+       * dired.el (dired-mode): Call hack-dir-local-variables-non-file-buffer.
+       * dired-x.el (dired-omit-mode): Safe if boolean.
+       (dired-enable-local-variables): Fix doc and custom type.
+       (dired-enable-local-variables, dired-local-variables-file)
+       (dired-hack-local-variables): Make obsolete.
+       (dired-omit-here-always): Use dir-locals.el instead.
+       * files.el (safe-local-eval-forms): Add the write-file-hooks version.
 +2011-02-22  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * progmodes/compile.el (compilation-goto-locus): Call
 +      display-buffer-same-frame-other-window.
 +
 +      * window.el (window-atom-check-1): Fix handling of case where
 +      only one atomic window was left.
 +      (window-sizable-p): Fix doc-string.
 +      (window-size-fixed-p): Move after window-size-firxed-1.
 +      (split-window): Make sure that the new window gets any odd line
 +      since this was the Emacs 23 behavior.
 +      (window-list-no-nils, window-state-get-1, window-state-get)
 +      (window-state-put-1, window-state-put-2, window-state-put): New
 +      functions.
 +      (window-state-ignored-parameters, window-state-put-list): New
 +      variables.
 +      (display-buffer-alist): Fix doc-string.
 +      (display-buffer-even-sizes): Rename to
 +      display-buffer-even-window-sizes.
 +      (display-buffer-reuse-window): Call
 +      display-buffer-even-window-sizes.
 +      (display-buffer-pop-up-window): Don't pass specifiers to side
 +      window function.
 +      (display-buffer-same-window, display-buffer-same-frame)
 +      (display-buffer-other-window)
 +      (display-buffer-same-frame-other-window)
 +      (pop-to-buffer-same-frame)
 +      (pop-to-buffer-same-frame-other-window): Make these interactive.
 +      (display-buffer-alist-add, display-buffer-alist-set): New
 +      functions.
 +
+ 2011-02-22  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * help-fns.el (describe-function-1): Don't signal an error just because
+       the DOC file disappeared.
+ 2011-02-22  Seppo Sade <sepposade1@gmail.com>  (tiny change)
+       * eshell/esh-ext.el (eshell-external-command): Do not restrict
+       remote check to "ftp".  (Bug#8089)
+ 2011-02-21  Alan Mackenzie  <acm@muc.de>
+       Fix bug #7930.
+       * progmodes/cc-engine.el (c-state-literal-at): Prevent positions
+       in macros finding their way into c-state-nonlit-pos-cache.
+       Strengthen the comments.
+       (c-state-dump): New commented out diagnostic routine.
+ 2011-02-21  Michael Albinus  <michael.albinus@gmx.de>
+       * net/tramp.el (tramp-rfn-eshadow-setup-minibuffer): Do not use
+       `field' property of `rfn-eshadow-overlay'.
  2011-02-21  Lars Ingebrigtsen  <larsi@gnus.org>
  
        * net/netrc.el (netrc-parse): Comment fix.
diff --cc lisp/dired.el
index c0b95a85196183231c09979322c3d49687e03ae1,3f31ba581394c0ad2b2383d6b190c1dc206ac5ab..04a00efc9411faa5c7440f4ae2afc10056ba94c2
@@@ -4060,7 -4073,7 +4061,7 @@@ true then the type of the file linked t
  ;;;***
  \f
  ;;;### (autoloads (dired-do-relsymlink dired-jump) "dired-x" "dired-x.el"
- ;;;;;;  "86d436093caa9ae80f7b73915c6a4b4c")
 -;;;;;;  "515e1dbc42acebd9a0175c4209b6673c")
++;;;;;;  "c24f202ea049990539accfd4c2c73fe9")
  ;;; Generated autoloads from dired-x.el
  
  (autoload 'dired-jump "dired-x" "\
diff --cc lisp/files.el
Simple merge
Simple merge
index 06867f6d92aab6fc52efd5db04c7cc7a20e5b58e,7fe5383d865fb48269ae6d1b1e5994c6382913ac..d5ff0e12c0f428842ab1d7440f767c4f403a94d3
@@@ -4306,7 -4316,7 +4316,7 @@@ With prefix argument N moves forward N 
  
  ;;;***
  \f
--;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "04902da045706fb7f2b0915529ed161b")
++;;;### (autoloads (rmail-mime) "rmailmm" "rmailmm.el" "c530622b53038152ca84f2ec9313bd7a")
  ;;; Generated autoloads from rmailmm.el
  
  (autoload 'rmail-mime "rmailmm" "\
diff --cc src/ChangeLog
index 187449555c5b2b82ba9075af66292fc0c77c74c1,29a213a1e0996fa9c0a668d12a6aa9a3cd1bc687..a48f08d8e85d6037d3f622e6ebf3a836d7f43a47
+ 2011-02-25  Paul Eggert  <eggert@cs.ucla.edu>
+       * dired.c (Ffile_attributes): Increase size of modes from 10 to 12
+       as per recent filemodestring API change.  Reported by Jonas Ă–ster in
+       <http://lists.gnu.org/archive/html/emacs-devel/2011-02/msg01069.html>.
+ 2011-02-23  Ben Key  <bkey76@gmail.com>  (tiny change)
+       * nsterm.m (ns_draw_window_cursor): Obey the cursor_width argument
+       directly, for bar cursors.
+ 2011-02-23  Chong Yidong  <cyd@stupidchicken.com>
+       * xdisp.c (set_frame_cursor_types): Don't write an undefined value
+       into the frame's cursor_width.
+ 2011-02-23  Stefan Monnier  <monnier@iro.umontreal.ca>
+       * print.c (print_object): Never print old-style backquotes.
+       Obey escapeflag for hash tables as well.
+ 2011-02-23  Kenichi Handa  <handa@m17n.org>
+       * font.c (font_open_entity): Be sure to set scaled_pixel_size.
+       (font_find_for_lface): Check if attrs[LFACE_HEIGHT_INDEX] is integer.
 +2011-02-22  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.h (w): New slot clone_number.  Rename
 +      "inhibit_recombine" slot to "nested".
 +
 +      * window.c (Fwindow_clone_number, Fwindow_nested)
 +      (Fset_window_nested, Fset_window_clone_number): New functions.
 +      (recombine_windows): Write "nested" isntead of
 +      "inhibit_recombine".
 +      (make_parent_window): Set clone_number.
 +      (make_window): Set clone_number.  Write "nested" instead of
 +      "inhibit_recombine".
 +      (Fsplit_window_internal): Write "nested" instead of
 +      "inhibit_recombine".
 +      (Fresize_window_apply, Fdelete_window_internal): Add parens in
 +      EQ test.
 +      (saved_window): Add clone_number and write "nested" instead of
 +      "inhibit_recombine".
 +      (Fset_window_configuration, save_window_save): Set clone_number
 +      and write "nested" instead of "inhibit_recombine".
 +      (syms_of_window): Add Swindow_clone_number, Swindow_nested,
 +      Sset_window_nested and Sset_window_clone_number.
 +
 +      * buffer.c (sort_overlays, overlay_strings): When an overlay has
 +      the same clone-number property as the associated window don't
 +      skip it even if the window properties are different.
 +      (syms_of_buffer): Intern new Lisp_object Qclone_number.
 +
+ 2011-02-22  Paul Eggert  <eggert@cs.ucla.edu>
+       * dired.c (Ffile_attributes): Simplify and avoid #ifdef.
+ 2011-02-22  Wolfgang Jenkner  <wjenkner@inode.at>  (tiny change)
+       * lread.c (openp): Correct Boolean typo in last commit.
+ 2011-02-22  Adrian Robert  <Adrian.B.Robert@gmail.com>
+       * nsterm.m (EmacsView-keyDown:): Don't pass shift-only-modified
+       key to Emacs, treat as unmodified (go to input manager processing).
+ 2011-02-22  Paul Eggert  <eggert@cs.ucla.edu>
+       Assume S_ISLNK etc. work, since gnulib supports this.
+       * config.in: Regenerate.
+       * dired.c (lstat): Remove.
+       (file_name_completion): Assume S_ISDIR works.
+       (file_name_completion_stat): Assume S_ISLNK works.
+       Do not bother calling stat unless lstat says it's a symlink.
+       * fileio.c (S_ISLNK, S_ISFIFO, S_ISREG, lstat): Remove.
+       (Fcopy_file): Assume S_ISREG and S_ISLNK work.
+       (check_writable, Ffile_writable_p, Fset_file_times):
+       Assume S_ISDIR works.
+       (Ffile_readable_p): Use S_IFIFO, not S_ISFIFO, to guess whether
+       fifos exist.
+       (Ffile_regular_p, Finsert_file_contents): Assume S_ISREG works.
+       * filelock.c (S_ISLNK): Remove.
+       * lread.c (openp): Assume S_ISDIR works.
+       * xrdb.c (S_ISDIR): Remove.
+ 2011-02-21  Eli Zaretskii  <eliz@gnu.org>
+       * makefile.w32-in ($(BLD)/filemode.$(O)): Move recipe to
+       lib/makefile.w32-in.
+       ($(BLD)/dired.$(O)): Depend on $(EMACS_ROOT)/lib/filemode.h.
+       (GLOBAL_SOURCES): Remove filemode.c.
+       (OBJ1): Remove $(BLD)/filemode.$(O).
+ 2011-02-21  Paul Eggert  <eggert@cs.ucla.edu>
+       Import filemode module from gnulib.
+       * Makefile.in (base_obj): Remove filemode.o, as it's now in ../lib.
+       * deps.mk (dired.o): Depend on ../lib/filemode.h, too.
+       (filemode.o): Remove; this is now in ../lib.
+       * dired.c: Include <filemode.h>.
+       (filemodestring): Remove now-redundant decl.
+       * config.in: Regenerate.
  2011-02-20  Eli Zaretskii  <eliz@gnu.org>
  
        * makefile.w32-in ($(BLD)/fns.$(O)): Depend on
diff --cc src/print.c
Simple merge
diff --cc src/xdisp.c
Simple merge