]> code.delx.au - gnu-emacs/commitdiff
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-14
authorMiles Bader <miles@gnu.org>
Sat, 11 Feb 2006 00:11:19 +0000 (00:11 +0000)
committerMiles Bader <miles@gnu.org>
Sat, 11 Feb 2006 00:11:19 +0000 (00:11 +0000)
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 58-65)

   - Update from CVS
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 22-28)

   - Update from CVS
   - Merge from emacs--devo--0
   - Update from CVS: lisp/gnus.el: Remove bogus comment.

21 files changed:
1  2 
etc/NEWS
etc/PROBLEMS
lisp/ChangeLog
lisp/Makefile.in
lisp/desktop.el
lisp/progmodes/perl-mode.el
lisp/progmodes/sh-script.el
lisp/subr.el
lisp/term/mac-win.el
lisp/tumme.el
src/ChangeLog
src/alloc.c
src/data.c
src/doc.c
src/keyboard.c
src/keymap.c
src/lisp.h
src/macfns.c
src/macterm.c
src/window.c
src/xterm.c

diff --cc etc/NEWS
Simple merge
diff --cc etc/PROBLEMS
Simple merge
diff --cc lisp/ChangeLog
index 75802219b4eadb140fd18d5d37058d85367b02e4,2686f9b2ff851fcf08403e13eca0446cfd087c5c..be2fdb32c6ef69b15b7118acc2a449ffbe6729e0
 -2006-02-11  Mathias Dahl  <brakjoller@hotmail.com>
 -
 -      * tumme.el (tumme-dir): Changed default value to
 -        "~/.emacs-d/tumme"
 -        (tumme-dir): New function. Copied from thumbs.el.
 -
+ 2006-02-10  Juanma Barranquero  <lekktu@gmail.com>
+       * desktop.el (desktop-outvar): Fix typo.
+       (desktop-save-buffer-p): Doc fix.
+       * subr.el (substitute-key-definition): Fix typo.
+ 2006-02-10  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+       * frame.el (select-frame-set-input-focus): Call x-focus-frame also
+       when window-system is mac.
+       * term/mac-win.el (fontset-standard): Rename from "fontset-mac".
+ 2006-02-10  Kim F. Storm  <storm@cua.dk>
+       * subr.el (substitute-key-definition-key): Pass t for NOERROR to
+       indirect-function instead of using condition-case.
+ 2006-02-10  Mathias Dahl  <mathias.dahl@gmail.com>
+       * tumme.el (tumme-copy-with-exif-file-name): Tried to make
+       docstring less `colloquial'...
+ 2006-02-09  Mathias Dahl  <mathias.dahl@gmail.com>
+       * tumme.el: Added a couple of todo items.
+ 2006-02-09  Lars Hansen  <larsh@soem.dk>
+       * hilit-chg.el: Add highlight-changes-mode to desktop-locals-to-save.
+       (highlight-changes-mode): Don't change desktop-locals-to-save.
+ 2006-02-09  Chong Yidong  <cyd@stupidchicken.com>
+       * image-mode.el (image-toggle-display): Clear image cache if using
+       filename.
+ 2006-02-09  Masatake YAMATO  <jet@gyve.org>
+       * dired-x.el (dired-guess-shell-alist-default): Add .man as
+       a `dired-man' target.
+       * progmodes/autoconf.el (autoconf-font-lock-keywords): Check start
+       boundary of symbols.
+ 2006-02-08  Peter Doornbosch  <peter.doornbosch@luminis.nl>  (tiny change)
+       * vc-svn.el (vc-svn-print-log): Show recent commits as well.
+ 2006-02-09  Juanma Barranquero  <lekktu@gmail.com>
+       * hilit-chg.el (hilit-chg-update-all-buffers): Use `mapc' instead of
+       `mapcar'; return nil.
+ 2006-02-08  Chong Yidong  <cyd@stupidchicken.com>
+       * mouse.el (mouse-drag-track): Don't change window if we rebind to
+       some other event.
+ 2006-02-08  Ryan Yeske  <rcyeske@gmail.com>
+       * net/rcirc.el (rcirc-startup-channels-alist):
+       Add irc.freenode.net and #emacs as defaults.
+       (rcirc-ignore-all-activity-flag): Remove variable.
+       (rcirc-authinfo): New variable.
+       (rcirc-authinfo-filename): Remove variable.
+       (rcirc-always-use-server-buffer-flag): New flag.
+       (rcirc): M-x rcirc will automatically connect without prompting.
+       C-u M-x rcirc will prompt.  Use rcirc-connect to create a
+       connection in lisp.
+       (rcirc-process-server-response-1): Remove everything but the nick
+       portion of the sender so it doesn't need to be done everywhere
+       else.  Update related code.
+       (global-map): Remove global keybindings.
+       (rcirc-get-buffer-create): Make sure rcirc-topic is set.
+       (rcirc-send-input): Split into several functions.
+       (rcirc-process-input-line, rcirc-process-message)
+       (rcirc-process-command): New functions.
+       (rcirc-target-buffer): New function to determine where to route
+       messages.
+       (rcirc-user-nick): Save match data.
+       (rcirc-toggle-ignore-buffer-activity)
+       (rcirc-update-activity-string): Remove global ignore functionality,
+       which can be done now by toggling rcirc-track-minor-mode.
+       (rcirc-track-minor-mode-map): New keymap.
+       (rcirc-track-minor-mode): New minor-mode.
+       (ignore): Make the ignore output nicer.  Always print it when
+       adding or removing nicks.
+       (rcirc-url-regexp): Improve.
+       (rcirc-mangle-text): Remove properties before using text in the
+       modeline.
+       (rcirc-authenticate): Authentication data comes from
+       rcirc-authinfo, not the file pointed to by rcirc-authinfo-file.
+       (rcirc-server-prefix): Inherit from rcirc-server.
+ 2006-02-08  Mathias Megyei  <Mathias.Megyei@micronas.com>  (tiny change)
+       * Makefile.in (compile): Append "|| true" to the end of the `find'
+       command, like compile-always does.
+ 2006-02-08  Sam Steingold  <sds@gnu.org>
+       * net/tramp.el (tramp-maybe-open-connection): Do not wait for
+       output from a dead connection.
  2006-02-07  Mathias Dahl  <brakjoller@hotmail.com>
  
        * dired.el (dired-mode-map): Add more bindings for tumme.
Simple merge
diff --cc lisp/desktop.el
Simple merge
Simple merge
Simple merge
diff --cc lisp/subr.el
Simple merge
index 1917af5994215f6db95ccb6b15cb57074a0cfb3b,4ccb017682c210cfa1edb07451a7e24ad8151cc4..b08284731a4684bd78012e091984d29f8c10ec19
@@@ -1811,13 -1898,29 +1811,13 @@@ It returns a name of the created fontse
  
  ;; Setup the default fontset.
  (setup-default-fontset)
 -(cond ((x-list-fonts "*-iso10646-1")
 -       ;; Use ATSUI (if available) for the following charsets.
 -       (dolist
 -         (charset '(latin-iso8859-1
 -                    latin-iso8859-2 latin-iso8859-3 latin-iso8859-4
 -                    thai-tis620 greek-iso8859-7 arabic-iso8859-6
 -                    hebrew-iso8859-8 cyrillic-iso8859-5
 -                    latin-iso8859-9 latin-iso8859-15 latin-iso8859-14
 -                    japanese-jisx0212 chinese-sisheng ipa
 -                    vietnamese-viscii-lower vietnamese-viscii-upper
 -                    lao ethiopic tibetan))
 -       (set-fontset-font nil charset '(nil . "iso10646-1"))))
 -      ((null (x-list-fonts "*-iso8859-1"))
 -       ;; Add Mac-encoding fonts unless ETL fonts are installed.
 -       (fontset-add-mac-fonts "fontset-default")))
  
  ;; Create a fontset that uses mac-roman font.  With this fontset,
 -;; characters decoded from mac-roman encoding (ascii, latin-iso8859-1,
 -;; and mule-unicode-xxxx-yyyy) are displayed by a mac-roman font.
 -(create-fontset-from-fontset-spec
 - "-etl-fixed-medium-r-normal-*-16-*-*-*-*-*-fontset-standard,
 -ascii:-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman")
 -(fontset-add-mac-fonts "fontset-standard" t)
 +;; characters belonging to mac-roman charset (that contains ASCII and
 +;; more Latin characters) are displayed by a mac-roman font.
 +(create-fontset-from-mac-roman-font
 + "-*-Monaco-*-*-*-*-12-*-*-*-*-*-mac-roman" nil
-  "-apple-Monaco-normal-r-*-*-12-*-*-*-*-*-fontset-mac")
++ "-apple-Monaco-normal-r-*-*-12-*-*-*-*-*-fontset-standard")
  
  ;; Create fontset specified in X resources "Fontset-N" (N is 0, 1, ...).
  (create-fontset-from-x-resource)
diff --cc lisp/tumme.el
Simple merge
diff --cc src/ChangeLog
Simple merge
diff --cc src/alloc.c
Simple merge
diff --cc src/data.c
Simple merge
diff --cc src/doc.c
Simple merge
diff --cc src/keyboard.c
Simple merge
diff --cc src/keymap.c
Simple merge
diff --cc src/lisp.h
Simple merge
diff --cc src/macfns.c
index ae7f1d87be4d8bd1c37dd885656c2d4ef1d6a080,b6ef85bcd9fbd6f69deb44130d6645e8748c95b9..3f59a4590105047108ecdec9b0d6ce433f0716dd
@@@ -2544,7 -2534,7 +2534,7 @@@ This function is an internal primitive-
        font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1");
      /* If those didn't work, look for something which will at least work.  */
      if (! STRINGP (font))
-       font = x_new_fontset (f, build_string ("fontset-mac"));
 -      font = x_new_fontset (f, "fontset-standard");
++      font = x_new_fontset (f, build_string ("fontset-standard"));
      if (! STRINGP (font))
        font = x_new_font (f, "-*-monaco-*-12-*-mac-roman");
      if (! STRINGP (font))
@@@ -3664,7 -3700,7 +3700,7 @@@ x_create_tip_frame (dpyinfo, parms, tex
        font = x_new_font (f, "-ETL-fixed-medium-r-*--*-160-*-*-*-*-iso8859-1");
      /* If those didn't work, look for something which will at least work.  */
      if (! STRINGP (font))
-       font = x_new_fontset (f, build_string ("fontset-mac"));
 -      font = x_new_fontset (f, "fontset-standard");
++      font = x_new_fontset (f, build_string ("fontset-standard"));
      if (! STRINGP (font))
        font = x_new_font (f, "-*-monaco-*-12-*-mac-roman");
      if (! STRINGP (font))
diff --cc src/macterm.c
Simple merge
diff --cc src/window.c
Simple merge
diff --cc src/xterm.c
Simple merge