Now on revision 106118. Conflicting tags: mh-e-doc-8.3 mh-e-8.3 ------------------------------------------------------------ revno: 106118 committer: Michael Albinus branch nick: trunk timestamp: Tue 2011-10-18 11:58:06 +0200 message: * net/tramp.el (tramp-file-name-handler): Load Tramp packages silently. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-18 08:02:47 +0000 +++ lisp/ChangeLog 2011-10-18 09:58:06 +0000 @@ -1,3 +1,7 @@ +2011-10-18 Michael Albinus + + * net/tramp.el (tramp-file-name-handler): Load Tramp packages silently. + 2011-10-18 Jirka Kosek (tiny change) * international/mule.el (sgml-html-meta-auto-coding-function): === modified file 'lisp/net/tramp.el' --- lisp/net/tramp.el 2011-10-12 18:32:35 +0000 +++ lisp/net/tramp.el 2011-10-18 09:58:06 +0000 @@ -1886,7 +1886,7 @@ (when (and (listp sf) (eq (car sf) 'autoload)) (let ((default-directory (tramp-compat-temporary-file-directory))) - (load (cadr sf) 'noerror))) + (load (cadr sf) 'noerror 'nomessage))) (apply foreign operation args)) ;; Trace that somebody has interrupted the operation. ------------------------------------------------------------ revno: 106117 author: Daiki Ueno committer: Katsumi Yamaoka branch nick: trunk timestamp: Tue 2011-10-18 08:12:19 +0000 message: Fix changelog entry for the last mml2015-epg-find-usable-key change. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-10-17 22:51:37 +0000 +++ lisp/gnus/ChangeLog 2011-10-18 08:12:19 +0000 @@ -18,10 +18,15 @@ 2011-10-17 Daiki Ueno + * mml2015.el (mml2015-epg-find-usable-key): Add comment about the + previous change. + * mml1991.el (mml1991-epg-find-usable-key): Skip the whole key if the + primary key is marked as disabled. + +2011-10-17 Christian von Roques (tiny change) + * mml2015.el (mml2015-epg-find-usable-key): Skip the whole key if the primary key is marked as disabled. - * mml1991.el (mml1991-epg-find-usable-key): Ditto. - Thanks to Christian von Roques . 2011-10-11 Andreas Schwab ------------------------------------------------------------ revno: 106116 fixes bug(s): http://debbugs.gnu.org/9716 author: Jirka Kosek committer: Juri Linkov branch nick: trunk timestamp: Tue 2011-10-18 11:02:47 +0300 message: * lisp/international/mule.el (sgml-html-meta-auto-coding-function): Add support for detecting encoding in HTML5 specified only as . Implementation just makes http-equiv and content-type parts from HTML4 encoding string optional. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-18 06:52:32 +0000 +++ lisp/ChangeLog 2011-10-18 08:02:47 +0000 @@ -1,3 +1,10 @@ +2011-10-18 Jirka Kosek (tiny change) + + * international/mule.el (sgml-html-meta-auto-coding-function): + Add support for detecting encoding in HTML5 specified only as + . Implementation just makes http-equiv and + content-type parts from HTML4 encoding string optional. (Bug#9716) + 2011-10-18 Glenn Morris * vc/vc.el (vc-initial-comment): Mark as obsolete. (Bug#9745) === modified file 'lisp/international/mule.el' --- lisp/international/mule.el 2011-02-01 21:37:12 +0000 +++ lisp/international/mule.el 2011-10-18 08:02:47 +0000 @@ -2403,8 +2403,8 @@ ;; (allowing for whitespace at bob). Note: 'DOCTYPE NETSCAPE' is ;; useful for Mozilla bookmark files. (when (and (re-search-forward "\\`[[:space:]\n]*\\(]" size t)) + (let* ((match (match-string 2)) (sym (intern (downcase match)))) (if (coding-system-p sym) sym ------------------------------------------------------------ revno: 106115 fixes bug(s): http://debbugs.gnu.org/9745 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-10-17 23:52:32 -0700 message: Doc fixes related to vc-initial-comment. * doc/emacs/maintaining.texi (Registering): Remove vc-initial-comment. * lisp/vc/vc.el (vc-initial-comment): Mark as obsolete. * lisp/ChangeLog.15: Fix old entry. * etc/NEWS: Mention this. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-10-18 01:42:28 +0000 +++ doc/emacs/ChangeLog 2011-10-18 06:52:32 +0000 @@ -1,3 +1,7 @@ +2011-10-18 Glenn Morris + + * maintaining.texi (Registering): Remove vc-initial-comment. (Bug#9745) + 2011-10-18 Chong Yidong * display.texi (Faces): Simplify discussion. Move documentation === modified file 'doc/emacs/maintaining.texi' --- doc/emacs/maintaining.texi 2011-04-24 18:47:17 +0000 +++ doc/emacs/maintaining.texi 2011-10-18 06:52:32 +0000 @@ -898,10 +898,11 @@ numeric argument; then it reads the initial revision ID for this particular file using the minibuffer. -@vindex vc-initial-comment - If @code{vc-initial-comment} is non-@code{nil}, @kbd{C-x v i} reads an -initial comment to describe the purpose of this source file. Reading -the initial comment works like reading a log entry (@pxref{Log Buffer}). +@c See http://debbugs.gnu.org/9745 +@c @vindex vc-initial-comment +@c If @code{vc-initial-comment} is non-@code{nil}, @kbd{C-x v i} reads an +@c initial comment to describe the purpose of this source file. Reading +@c the initial comment works like reading a log entry (@pxref{Log Buffer}). @node VC Change Log @subsubsection VC Change Log === modified file 'etc/NEWS' --- etc/NEWS 2011-10-18 01:42:28 +0000 +++ etc/NEWS 2011-10-18 06:52:32 +0000 @@ -844,6 +844,10 @@ *** New command `vc-ediff' allows visual comparison of two revisions of a file similar to `vc-diff', but using ediff backend. ++++ +*** The option vc-initial-comment was removed in Emacs 23.2, but +this was not advertised at the time. + ** FIXME: xdg-open for browse-url and reportbug, 2010/08. ** Obsolete modes === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-18 06:17:05 +0000 +++ lisp/ChangeLog 2011-10-18 06:52:32 +0000 @@ -1,3 +1,7 @@ +2011-10-18 Glenn Morris + + * vc/vc.el (vc-initial-comment): Mark as obsolete. (Bug#9745) + 2011-10-18 Chong Yidong * faces.el (cursor): Doc fix. === modified file 'lisp/ChangeLog.15' --- lisp/ChangeLog.15 2011-08-07 14:14:54 +0000 +++ lisp/ChangeLog.15 2011-10-18 06:52:32 +0000 @@ -22676,7 +22676,7 @@ (vc-next-action, vc-transfer-file, vc-rename-file): Also pass the backend when calling vc-mode-line. (vc-register): Do not create a closure for calling the vc register - function, call it directly. + function, call it directly. No longer obey vc-initial-comment. 2009-06-23 Dan Nicolaescu === modified file 'lisp/vc/vc.el' --- lisp/vc/vc.el 2011-10-10 17:52:03 +0000 +++ lisp/vc/vc.el 2011-10-18 06:52:32 +0000 @@ -675,6 +675,8 @@ :type 'boolean :group 'vc) +(make-obsolete-variable 'vc-initial-comment "it has no effect." "23.2") + (defcustom vc-default-init-revision "1.1" "A string used as the default revision number when a new file is registered. This can be overridden by giving a prefix argument to \\[vc-register]. This ------------------------------------------------------------ revno: 106114 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-10-17 23:24:57 -0700 message: Small updates for admin/notes/. * admin/notes/changelogs: Copy some info here from copyright. * admin/notes/copyright: Tiny update. diff: === modified file 'admin/notes/changelogs' --- admin/notes/changelogs 2008-11-26 02:50:30 +0000 +++ admin/notes/changelogs 2011-10-18 06:24:57 +0000 @@ -1,3 +1,7 @@ +If installing changes written by someone else, make the ChangeLog +entry in their name, not yours. + + http://lists.gnu.org/archive/html/emacs-devel/2007-09/msg00793.html There is no need to make change log entries for files such as NEWS, MAINTAINERS, and FOR-RELEASE. === modified file 'admin/notes/copyright' --- admin/notes/copyright 2011-07-24 22:15:47 +0000 +++ admin/notes/copyright 2011-10-18 06:24:57 +0000 @@ -24,9 +24,8 @@ 2. When installing code written by someone else, the ChangeLog entry should be in the name of the author of the code, not the person who -installs it. I think it is helpful to put the author (if not yourself) -in the commit log as well (you can also use bzr commit's "--author" -option); and to not install any of your own changes in the same commit. +installs it. Also use bzr commit's "--author" option. +Do not install any of your own changes in the same commit. 3. With images, add the legal info to a README file in the directory containing the image. ------------------------------------------------------------ revno: 106113 committer: Chong Yidong branch nick: trunk timestamp: Tue 2011-10-18 02:19:28 -0400 message: * make-dist: Remove Cocoa/Emacs.xcodeproj from distribution. diff: === modified file 'ChangeLog' --- ChangeLog 2011-10-17 17:28:17 +0000 +++ ChangeLog 2011-10-18 06:19:28 +0000 @@ -1,3 +1,7 @@ +2011-10-18 Chong Yidong + + * make-dist: Remove Cocoa/Emacs.xcodeproj from distribution. + 2011-10-13 Glenn Morris * configure.in: Also look for tputs in libcurses. (Bug#9736) === modified file 'make-dist' --- make-dist 2011-09-26 08:23:13 +0000 +++ make-dist 2011-10-18 06:19:28 +0000 @@ -302,7 +302,6 @@ nextstep/Cocoa/Emacs.base/Contents \ nextstep/Cocoa/Emacs.base/Contents/Resources \ nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj \ - nextstep/Cocoa/Emacs.xcodeproj \ nextstep/GNUstep \ nextstep/GNUstep/Emacs.base \ nextstep/GNUstep/Emacs.base/Resources @@ -438,10 +437,6 @@ (cd nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj ln InfoPlist.strings ../../../../../../${tempdir}/nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj) -echo "Making links to \`nextstep/Cocoa/Emacs.xcodeproj'" -(cd nextstep/Cocoa/Emacs.xcodeproj - ln project.pbxproj ../../../${tempdir}/nextstep/Cocoa/Emacs.xcodeproj) - echo "Making links to \`nextstep/GNUstep/Emacs.base/Resources'" (cd nextstep/GNUstep/Emacs.base/Resources ln Emacs.desktop Info-gnustep.plist README emacs.tiff ../../../../${tempdir}/nextstep/GNUstep/Emacs.base/Resources ) ------------------------------------------------------------ revno: 106112 committer: Chong Yidong branch nick: trunk timestamp: Tue 2011-10-18 02:17:05 -0400 message: * lisp/faces.el (cursor): Doc fix. Also, remove the :foreground attributes from cursor faces in built-in themes, since that attribute is unmeaningful. diff: === modified file 'etc/themes/deeper-blue-theme.el' --- etc/themes/deeper-blue-theme.el 2011-09-13 01:55:46 +0000 +++ etc/themes/deeper-blue-theme.el 2011-10-18 06:17:05 +0000 @@ -37,7 +37,7 @@ `(compilation-line-number ((,class (:foreground "LightGreen")))) `(cperl-array-face ((,class (:foreground "yellow2")))) `(cperl-hash-face ((,class (:foreground "coral1")))) - `(cursor ((,class (:background "green" :foreground "black")))) + `(cursor ((,class (:background "green")))) `(default ((,class (:background "#181a26" :foreground "gray80")))) `(diff-added ((,class (nil)))) `(diff-changed ((,class (nil)))) === modified file 'etc/themes/dichromacy-theme.el' --- etc/themes/dichromacy-theme.el 2011-08-19 00:12:45 +0000 +++ etc/themes/dichromacy-theme.el 2011-10-18 06:17:05 +0000 @@ -42,7 +42,7 @@ (custom-theme-set-faces 'dichromacy `(default ((,class (:foreground "black" :background "white")))) - `(cursor ((,class (:foreground "white" :background "black")))) + `(cursor ((,class (:background "black")))) ;; Highlighting faces `(fringe ((,class (:background "#f7f7f7")))) `(highlight ((,class (:foreground ,blue :background "#e5e5e5")))) === modified file 'etc/themes/misterioso-theme.el' --- etc/themes/misterioso-theme.el 2011-06-14 05:06:26 +0000 +++ etc/themes/misterioso-theme.el 2011-10-18 06:17:05 +0000 @@ -33,7 +33,7 @@ (:background "#2d3743" :foreground "#e1e1e0")) (,class (:background "#3a3a3a" :foreground "#e1e1e0")))) - `(cursor ((,class (:background "#415160" :foreground "#415160")))) + `(cursor ((,class (:background "#415160")))) ;; Highlighting faces `(fringe ((,class (:background "#2e3748")))) `(highlight ((,class (:background "#338f86" :foreground "#e1e1e0")))) === modified file 'etc/themes/tango-dark-theme.el' --- etc/themes/tango-dark-theme.el 2011-08-19 00:12:45 +0000 +++ etc/themes/tango-dark-theme.el 2011-10-18 06:17:05 +0000 @@ -56,7 +56,7 @@ (:foreground ,alum-1 :background "#222")) (,class (:foreground ,alum-1 :background "black")))) - `(cursor ((,class (:foreground ,alum-6 :background ,butter-1)))) + `(cursor ((,class (:background ,butter-1)))) ;; Highlighting faces `(fringe ((,class (:background ,alum-7)))) `(highlight ((,class (:foreground ,alum-6 :background ,butter-2)))) === modified file 'etc/themes/tango-theme.el' --- etc/themes/tango-theme.el 2011-08-19 00:12:45 +0000 +++ etc/themes/tango-theme.el 2011-10-18 06:17:05 +0000 @@ -49,7 +49,7 @@ (custom-theme-set-faces 'tango `(default ((,class (:foreground ,alum-6 :background ,alum-1)))) - `(cursor ((,class (:foreground ,alum-1 :background ,blue-3)))) + `(cursor ((,class (:background ,blue-3)))) ;; Highlighting faces `(fringe ((,class (:background ,alum-2)))) `(highlight ((,class (:background ,alum-3)))) === modified file 'etc/themes/wheatgrass-theme.el' --- etc/themes/wheatgrass-theme.el 2011-08-19 00:12:45 +0000 +++ etc/themes/wheatgrass-theme.el 2011-10-18 06:17:05 +0000 @@ -29,7 +29,7 @@ (custom-theme-set-faces 'wheatgrass `(default ((,class (:foreground "wheat" :background "black")))) - `(cursor ((,class (:foreground "black" :background "thistle")))) + `(cursor ((,class (:background "thistle")))) `(error ((,class (:foreground "salmon1")))) `(warning ((,class (:foreground "orange")))) `(success ((,class (:foreground "yellow green")))) === modified file 'etc/themes/whiteboard-theme.el' --- etc/themes/whiteboard-theme.el 2011-09-13 01:55:46 +0000 +++ etc/themes/whiteboard-theme.el 2011-10-18 06:17:05 +0000 @@ -38,7 +38,7 @@ `(cperl-array-face ((,class (:foreground "SlateBlue3")))) `(cperl-hash-face ((,class (:foreground "turquoise3")))) `(cperl-nonoverridable-face ((,class (:foreground "orchid3")))) - `(cursor ((,class (:background "Green4" :foreground "gainsboro")))) + `(cursor ((,class (:background "Green4")))) `(default ((,class (:background "whitesmoke" :foreground "black")))) `(dired-marked ((,class (:background "dodgerblue3" :foreground "white")))) `(flymake-errline ((,class (:background nil :underline "red")))) === modified file 'etc/themes/wombat-theme.el' --- etc/themes/wombat-theme.el 2011-06-14 05:06:26 +0000 +++ etc/themes/wombat-theme.el 2011-10-18 06:17:05 +0000 @@ -31,7 +31,7 @@ (custom-theme-set-faces 'wombat `(default ((,class (:background "#242424" :foreground "#f6f3e8")))) - `(cursor ((,class (:background "#656565" :foreground "#f6f3e8")))) + `(cursor ((,class (:background "#656565")))) ;; Highlighting faces `(fringe ((,class (:background "#303030")))) `(highlight ((,class (:background "#454545" :foreground "#ffffff" === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-17 22:21:48 +0000 +++ lisp/ChangeLog 2011-10-18 06:17:05 +0000 @@ -1,3 +1,7 @@ +2011-10-18 Chong Yidong + + * faces.el (cursor): Doc fix. + 2011-10-17 Chong Yidong * font-lock.el (font-lock-maximum-size): Mark as obsolete. === modified file 'lisp/faces.el' --- lisp/faces.el 2011-10-02 23:53:59 +0000 +++ lisp/faces.el 2011-10-18 06:17:05 +0000 @@ -2366,6 +2366,10 @@ '((((background light)) :background "black") (((background dark)) :background "white")) "Basic face for the cursor color under X. +Currently, only the `:background' attribute is meaningful; all +other attributes are ignored. The cursor foreground color is +taken from the background color of the underlying text. + Note: Other faces cannot inherit from the cursor face." :version "21.1" :group 'cursor ------------------------------------------------------------ revno: 106111 committer: Jan D. branch nick: trunk timestamp: Tue 2011-10-18 07:47:56 +0200 message: Removed nextstep/Cocoa/Emacs.xcodeproj. diff: === modified file 'nextstep/ChangeLog' --- nextstep/ChangeLog 2011-04-06 12:18:10 +0000 +++ nextstep/ChangeLog 2011-10-18 05:47:56 +0000 @@ -1,3 +1,9 @@ +2011-10-18 Jan Djärv + + * Cocoa/Emacs.xcodeproj: + * Cocoa/Emacs.xcodeproj/project.pbxproj: + Removed. + 2011-03-07 Chong Yidong * Version 23.3 released. === removed directory 'nextstep/Cocoa/Emacs.xcodeproj' === removed file 'nextstep/Cocoa/Emacs.xcodeproj/project.pbxproj' --- nextstep/Cocoa/Emacs.xcodeproj/project.pbxproj 2011-03-03 08:03:01 +0000 +++ nextstep/Cocoa/Emacs.xcodeproj/project.pbxproj 1970-01-01 00:00:00 +0000 @@ -1,798 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 42; - objects = { - -/* Begin PBXBuildFile section */ - 3C3AF9CA0FC10CDF001240E9 /* menu.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C3AF9C90FC10CDF001240E9 /* menu.c */; }; - 3C3AF9D50FC10D85001240E9 /* libncurses.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 3C3AF9D40FC10D85001240E9 /* libncurses.dylib */; }; - 3CED87390FC0F581005ACB89 /* alloc.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDC50902EA8200B2EF7E /* alloc.c */; }; - 3CED873A0FC0F581005ACB89 /* atimer.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDCD0902EA8200B2EF7E /* atimer.c */; }; - 3CED873B0FC0F581005ACB89 /* buffer.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED8B0902EA8200B2EF7E /* buffer.c */; }; - 3CED873C0FC0F581005ACB89 /* bytecode.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDC60902EA8200B2EF7E /* bytecode.c */; }; - 3CED873D0FC0F581005ACB89 /* callint.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDB40902EA8200B2EF7E /* callint.c */; }; - 3CED873E0FC0F581005ACB89 /* callproc.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDC70902EA8200B2EF7E /* callproc.c */; }; - 3CED873F0FC0F581005ACB89 /* casefiddle.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDC90902EA8200B2EF7E /* casefiddle.c */; }; - 3CED87400FC0F581005ACB89 /* casetab.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDC10902EA8200B2EF7E /* casetab.c */; }; - 3CED87410FC0F581005ACB89 /* category.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED7B0902EA8200B2EF7E /* category.c */; }; - 3CED87420FC0F581005ACB89 /* ccl.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDB60902EA8200B2EF7E /* ccl.c */; }; - 3CED87430FC0F581005ACB89 /* character.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED8C0902EA8200B2EF7E /* character.c */; }; - 3CED87440FC0F581005ACB89 /* charset.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDC40902EA8200B2EF7E /* charset.c */; }; - 3CED87450FC0F581005ACB89 /* chartab.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDCC0902EA8200B2EF7E /* chartab.c */; }; - 3CED87460FC0F581005ACB89 /* cm.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDC80902EA8200B2EF7E /* cm.c */; }; - 3CED87470FC0F581005ACB89 /* cmds.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED7A0902EA8200B2EF7E /* cmds.c */; }; - 3CED87480FC0F581005ACB89 /* coding.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED7C0902EA8200B2EF7E /* coding.c */; }; - 3CED87490FC0F581005ACB89 /* composite.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDC20902EA8200B2EF7E /* composite.c */; }; - 3CED874A0FC0F581005ACB89 /* data.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDB30902EA8200B2EF7E /* data.c */; }; - 3CED874B0FC0F581005ACB89 /* dired.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDB20902EA8200B2EF7E /* dired.c */; }; - 3CED874C0FC0F581005ACB89 /* dispnew.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDC30902EA8200B2EF7E /* dispnew.c */; }; - 3CED874D0FC0F581005ACB89 /* doc.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDB10902EA8200B2EF7E /* doc.c */; }; - 3CED874E0FC0F581005ACB89 /* doprnt.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDB00902EA8200B2EF7E /* doprnt.c */; }; - 3CED874F0FC0F581005ACB89 /* editfns.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDBE0902EA8200B2EF7E /* editfns.c */; }; - 3CED87500FC0F581005ACB89 /* emacs.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDBD0902EA8200B2EF7E /* emacs.c */; }; - 3CED87510FC0F581005ACB89 /* eval.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDC00902EA8200B2EF7E /* eval.c */; }; - 3CED87520FC0F581005ACB89 /* fileio.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDBF0902EA8200B2EF7E /* fileio.c */; }; - 3CED87530FC0F581005ACB89 /* filelock.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDBC0902EA8200B2EF7E /* filelock.c */; }; - 3CED87540FC0F581005ACB89 /* filemode.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDBB0902EA8200B2EF7E /* filemode.c */; }; - 3CED87550FC0F581005ACB89 /* floatfns.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDB90902EA8200B2EF7E /* floatfns.c */; }; - 3CED87560FC0F581005ACB89 /* fns.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDB80902EA8200B2EF7E /* fns.c */; }; - 3CED87570FC0F581005ACB89 /* font.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C4D6D660DE50D2300B20D4E /* font.c */; }; - 3CED87580FC0F581005ACB89 /* fontset.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDB70902EA8200B2EF7E /* fontset.c */; }; - 3CED87590FC0F581005ACB89 /* frame.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDCB0902EA8200B2EF7E /* frame.c */; }; - 3CED875A0FC0F581005ACB89 /* fringe.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCEDCA0902EA8200B2EF7E /* fringe.c */; }; - 3CED875B0FC0F581005ACB89 /* image.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED780902EA8200B2EF7E /* image.c */; }; - 3CED875C0FC0F581005ACB89 /* indent.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED770902EA8200B2EF7E /* indent.c */; }; - 3CED875D0FC0F581005ACB89 /* insdel.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED760902EA8200B2EF7E /* insdel.c */; }; - 3CED875E0FC0F581005ACB89 /* intervals.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED750902EA8200B2EF7E /* intervals.c */; }; - 3CED875F0FC0F581005ACB89 /* keyboard.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED740902EA8200B2EF7E /* keyboard.c */; }; - 3CED87600FC0F581005ACB89 /* keymap.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED730902EA8100B2EF7E /* keymap.c */; }; - 3CED87610FC0F581005ACB89 /* lastfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED720902EA8100B2EF7E /* lastfile.c */; }; - 3CED87620FC0F581005ACB89 /* lread.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED710902EA8100B2EF7E /* lread.c */; }; - 3CED87630FC0F581005ACB89 /* macros.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED6D0902EA8100B2EF7E /* macros.c */; }; - 3CED87640FC0F581005ACB89 /* marker.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED690902EA8100B2EF7E /* marker.c */; }; - 3CED87650FC0F581005ACB89 /* md5.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED680902EA8100B2EF7E /* md5.c */; }; - 3CED87660FC0F581005ACB89 /* minibuf.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED670902EA8100B2EF7E /* minibuf.c */; }; - 3CED87670FC0F581005ACB89 /* nsfns.m in Sources */ = {isa = PBXBuildFile; fileRef = 090AF67E00C61DCD7F000001 /* nsfns.m */; }; - 3CED87680FC0F581005ACB89 /* nsfont.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C4D6D710DE50D5D00B20D4E /* nsfont.m */; }; - 3CED87690FC0F581005ACB89 /* nsimage.m in Sources */ = {isa = PBXBuildFile; fileRef = 3C15C1A70902D97100A8542F /* nsimage.m */; }; - 3CED876A0FC0F581005ACB89 /* nsmenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 090AF68000C61DCD7F000001 /* nsmenu.m */; }; - 3CED876B0FC0F581005ACB89 /* nsselect.m in Sources */ = {isa = PBXBuildFile; fileRef = 090AF68100C61DCD7F000001 /* nsselect.m */; }; - 3CED876C0FC0F581005ACB89 /* nsterm.m in Sources */ = {isa = PBXBuildFile; fileRef = 090AF68300C61DCD7F000001 /* nsterm.m */; }; - 3CED876D0FC0F581005ACB89 /* pre-crt0.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED640902EA8100B2EF7E /* pre-crt0.c */; }; - 3CED876E0FC0F581005ACB89 /* print.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED620902EA8100B2EF7E /* print.c */; }; - 3CED876F0FC0F581005ACB89 /* process.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED610902EA8100B2EF7E /* process.c */; }; - 3CED87700FC0F581005ACB89 /* regex.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED5F0902EA8100B2EF7E /* regex.c */; }; - 3CED87710FC0F581005ACB89 /* region-cache.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED5E0902EA8100B2EF7E /* region-cache.c */; }; - 3CED87720FC0F581005ACB89 /* scroll.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED5D0902EA8100B2EF7E /* scroll.c */; }; - 3CED87730FC0F581005ACB89 /* search.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED5C0902EA8100B2EF7E /* search.c */; }; - 3CED87740FC0F581005ACB89 /* sound.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED5A0902EA8100B2EF7E /* sound.c */; }; - 3CED87750FC0F581005ACB89 /* strftime.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED590902EA8100B2EF7E /* strftime.c */; }; - 3CED87760FC0F581005ACB89 /* syntax.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED570902EA8100B2EF7E /* syntax.c */; }; - 3CED87770FC0F581005ACB89 /* sysdep.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED560902EA8100B2EF7E /* sysdep.c */; }; - 3CED87780FC0F581005ACB89 /* term.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED550902EA8100B2EF7E /* term.c */; }; - 3CED877A0FC0F581005ACB89 /* terminal.c in Sources */ = {isa = PBXBuildFile; fileRef = 3C4D6D690DE50D2300B20D4E /* terminal.c */; }; - 3CED877B0FC0F581005ACB89 /* terminfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED950902EA8200B2EF7E /* terminfo.c */; }; - 3CED877C0FC0F581005ACB89 /* textprop.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED940902EA8200B2EF7E /* textprop.c */; }; - 3CED877E0FC0F581005ACB89 /* undo.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED920902EA8200B2EF7E /* undo.c */; }; - 3CED877F0FC0F581005ACB89 /* unexmacosx.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED830902EA8200B2EF7E /* unexmacosx.c */; }; - 3CED87800FC0F581005ACB89 /* window.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED9E0902EA8200B2EF7E /* window.c */; }; - 3CED87810FC0F581005ACB89 /* xdisp.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED9D0902EA8200B2EF7E /* xdisp.c */; }; - 3CED87820FC0F581005ACB89 /* xfaces.c in Sources */ = {isa = PBXBuildFile; fileRef = 3CDCED9C0902EA8200B2EF7E /* xfaces.c */; }; - 3CED88190FC0F5B3005ACB89 /* AppKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3CFDFC3A08E79A6800B05918 /* AppKit.framework */; }; -/* End PBXBuildFile section */ - -/* Begin PBXContainerItemProxy section */ - 3CED88220FC0FE5C005ACB89 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3CED87320FC0F557005ACB89; - remoteInfo = temacs; - }; -/* End PBXContainerItemProxy section */ - -/* Begin PBXFileReference section */ - 090AF67E00C61DCD7F000001 /* nsfns.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = nsfns.m; path = ../../src/nsfns.m; sourceTree = ""; }; - 090AF68000C61DCD7F000001 /* nsmenu.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = nsmenu.m; path = ../../src/nsmenu.m; sourceTree = ""; }; - 090AF68100C61DCD7F000001 /* nsselect.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = nsselect.m; path = ../../src/nsselect.m; sourceTree = ""; }; - 090AF68300C61DCD7F000001 /* nsterm.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = nsterm.m; path = ../../src/nsterm.m; sourceTree = ""; }; - 3C15C02F0902D89500A8542F /* termhooks.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = termhooks.h; path = ../../src/termhooks.h; sourceTree = ""; }; - 3C15C0300902D89500A8542F /* termchar.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = termchar.h; path = ../../src/termchar.h; sourceTree = ""; }; - 3C15C0330902D89500A8542F /* syswait.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = syswait.h; path = ../../src/syswait.h; sourceTree = ""; }; - 3C15C0340902D89500A8542F /* systty.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = systty.h; path = ../../src/systty.h; sourceTree = ""; }; - 3C15C0350902D89500A8542F /* systime.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = systime.h; path = ../../src/systime.h; sourceTree = ""; }; - 3C15C0360902D89500A8542F /* syssignal.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = syssignal.h; path = ../../src/syssignal.h; sourceTree = ""; }; - 3C15C0370902D89500A8542F /* sysselect.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sysselect.h; path = ../../src/sysselect.h; sourceTree = ""; }; - 3C15C0390902D89500A8542F /* syntax.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = syntax.h; path = ../../src/syntax.h; sourceTree = ""; }; - 3C15C0410902D89500A8542F /* region-cache.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = "region-cache.h"; path = "../../src/region-cache.h"; sourceTree = ""; }; - 3C15C0430902D89500A8542F /* regex.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = regex.h; path = ../../src/regex.h; sourceTree = ""; }; - 3C15C0460902D89500A8542F /* puresize.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = puresize.h; path = ../../src/puresize.h; sourceTree = ""; }; - 3C15C0470902D89500A8542F /* process.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = process.h; path = ../../src/process.h; sourceTree = ""; }; - 3C15C04C0902D89500A8542F /* point.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = point.h; path = ../../src/point.h; sourceTree = ""; }; - 3C15C04F0902D89500A8542F /* nsgui.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = nsgui.h; path = ../../src/nsgui.h; sourceTree = ""; }; - 3C15C0500902D89500A8542F /* ndir.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ndir.h; path = ../../src/ndir.h; sourceTree = ""; }; - 3C15C0550902D89500A8542F /* mem-limits.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = "mem-limits.h"; path = "../../src/mem-limits.h"; sourceTree = ""; }; - 3C15C0560902D89500A8542F /* md5.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = md5.h; path = ../../src/md5.h; sourceTree = ""; }; - 3C15C05D0902D89500A8542F /* macros.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = macros.h; path = ../../src/macros.h; sourceTree = ""; }; - 3C15C0660902D89500A8542F /* keymap.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = keymap.h; path = ../../src/keymap.h; sourceTree = ""; }; - 3C15C0680902D89500A8542F /* keyboard.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = keyboard.h; path = ../../src/keyboard.h; sourceTree = ""; }; - 3C15C06B0902D89500A8542F /* intervals.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = intervals.h; path = ../../src/intervals.h; sourceTree = ""; }; - 3C15C06E0902D89500A8542F /* indent.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = indent.h; path = ../../src/indent.h; sourceTree = ""; }; - 3C15C0760902D89500A8542F /* category.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = category.h; path = ../../src/category.h; sourceTree = ""; }; - 3C15C0770902D89500A8542F /* coding.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = coding.h; path = ../../src/coding.h; sourceTree = ""; }; - 3C15C0780902D89500A8542F /* buffer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = buffer.h; path = ../../src/buffer.h; sourceTree = ""; }; - 3C15C0890902D89500A8542F /* cm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = cm.h; path = ../../src/cm.h; sourceTree = ""; }; - 3C15C0950902D89500A8542F /* termopts.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = termopts.h; path = ../../src/termopts.h; sourceTree = ""; }; - 3C15C0A00902D89500A8542F /* window.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = window.h; path = ../../src/window.h; sourceTree = ""; }; - 3C15C0B80902D89500A8542F /* getpagesize.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = getpagesize.h; path = ../../src/getpagesize.h; sourceTree = ""; }; - 3C15C0BF0902D89500A8542F /* disptab.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = disptab.h; path = ../../src/disptab.h; sourceTree = ""; }; - 3C15C0C20902D89500A8542F /* epaths.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = epaths.h; path = ../../src/epaths.h; sourceTree = ""; }; - 3C15C0C50902D89500A8542F /* ccl.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ccl.h; path = ../../src/ccl.h; sourceTree = ""; }; - 3C15C0C70902D89500A8542F /* composite.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = composite.h; path = ../../src/composite.h; sourceTree = ""; }; - 3C15C0C80902D89500A8542F /* charset.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = charset.h; path = ../../src/charset.h; sourceTree = ""; }; - 3C15C0C90902D89500A8542F /* fontset.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = fontset.h; path = ../../src/fontset.h; sourceTree = ""; }; - 3C15C0D70902D89500A8542F /* commands.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = commands.h; path = ../../src/commands.h; sourceTree = ""; }; - 3C15C0D90902D89500A8542F /* dispextern.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = dispextern.h; path = ../../src/dispextern.h; sourceTree = ""; }; - 3C15C0DE0902D89500A8542F /* character.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = character.h; path = ../../src/character.h; sourceTree = ""; }; - 3C15C0E40902D89500A8542F /* frame.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = frame.h; path = ../../src/frame.h; sourceTree = ""; }; - 3C15C0E60902D89500A8542F /* atimer.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = atimer.h; path = ../../src/atimer.h; sourceTree = ""; }; - 3C15C0E70902D89500A8542F /* blockinput.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = blockinput.h; path = ../../src/blockinput.h; sourceTree = ""; }; - 3C15C1A70902D97100A8542F /* nsimage.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = nsimage.m; path = ../../src/nsimage.m; sourceTree = ""; }; - 3C3AF9C90FC10CDF001240E9 /* menu.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = menu.c; path = ../../src/menu.c; sourceTree = SOURCE_ROOT; }; - 3C3AF9D40FC10D85001240E9 /* libncurses.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libncurses.dylib; path = /usr/lib/libncurses.dylib; sourceTree = ""; }; - 3C4D6D660DE50D2300B20D4E /* font.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = font.c; path = ../../src/font.c; sourceTree = SOURCE_ROOT; }; - 3C4D6D670DE50D2300B20D4E /* font.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = font.h; path = ../../src/font.h; sourceTree = SOURCE_ROOT; }; - 3C4D6D690DE50D2300B20D4E /* terminal.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = terminal.c; path = ../../src/terminal.c; sourceTree = SOURCE_ROOT; }; - 3C4D6D710DE50D5D00B20D4E /* nsfont.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = nsfont.m; path = ../../src/nsfont.m; sourceTree = SOURCE_ROOT; }; - 3C7F3C3A07EB3B05003C8A4D /* nsterm.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = nsterm.h; path = ../../src/nsterm.h; sourceTree = ""; }; - 3CB8E29D0E2CE73A003F3104 /* Emacs.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = Emacs.icns; path = Emacs.base/Contents/Resources/Emacs.icns; sourceTree = ""; }; - 3CB8E29F0E2CE7F5003F3104 /* Credits.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = Credits.html; path = Emacs.base/Contents/Resources/Credits.html; sourceTree = ""; }; - 3CB8E2A60E2CE856003F3104 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = InfoPlist.strings; sourceTree = ""; }; - 3CC5434C07E2315800C271A9 /* Emacs.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Emacs.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 3CDCED330902E99700B2EF7E /* config.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = config.h; path = ../../src/config.h; sourceTree = ""; }; - 3CDCED550902EA8100B2EF7E /* term.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = term.c; path = ../../src/term.c; sourceTree = ""; }; - 3CDCED560902EA8100B2EF7E /* sysdep.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sysdep.c; path = ../../src/sysdep.c; sourceTree = ""; }; - 3CDCED570902EA8100B2EF7E /* syntax.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = syntax.c; path = ../../src/syntax.c; sourceTree = ""; }; - 3CDCED590902EA8100B2EF7E /* strftime.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = strftime.c; path = ../../src/strftime.c; sourceTree = ""; }; - 3CDCED5A0902EA8100B2EF7E /* sound.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = sound.c; path = ../../src/sound.c; sourceTree = ""; }; - 3CDCED5C0902EA8100B2EF7E /* search.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = search.c; path = ../../src/search.c; sourceTree = ""; }; - 3CDCED5D0902EA8100B2EF7E /* scroll.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = scroll.c; path = ../../src/scroll.c; sourceTree = ""; }; - 3CDCED5E0902EA8100B2EF7E /* region-cache.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = "region-cache.c"; path = "../../src/region-cache.c"; sourceTree = ""; }; - 3CDCED5F0902EA8100B2EF7E /* regex.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = regex.c; path = ../../src/regex.c; sourceTree = ""; }; - 3CDCED610902EA8100B2EF7E /* process.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = process.c; path = ../../src/process.c; sourceTree = ""; }; - 3CDCED620902EA8100B2EF7E /* print.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = print.c; path = ../../src/print.c; sourceTree = ""; }; - 3CDCED640902EA8100B2EF7E /* pre-crt0.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = "pre-crt0.c"; path = "../../src/pre-crt0.c"; sourceTree = ""; }; - 3CDCED670902EA8100B2EF7E /* minibuf.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = minibuf.c; path = ../../src/minibuf.c; sourceTree = ""; }; - 3CDCED680902EA8100B2EF7E /* md5.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = md5.c; path = ../../src/md5.c; sourceTree = ""; }; - 3CDCED690902EA8100B2EF7E /* marker.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = marker.c; path = ../../src/marker.c; sourceTree = ""; }; - 3CDCED6D0902EA8100B2EF7E /* macros.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = macros.c; path = ../../src/macros.c; sourceTree = ""; }; - 3CDCED710902EA8100B2EF7E /* lread.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = lread.c; path = ../../src/lread.c; sourceTree = ""; }; - 3CDCED720902EA8100B2EF7E /* lastfile.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = lastfile.c; path = ../../src/lastfile.c; sourceTree = ""; }; - 3CDCED730902EA8100B2EF7E /* keymap.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = keymap.c; path = ../../src/keymap.c; sourceTree = ""; }; - 3CDCED740902EA8200B2EF7E /* keyboard.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = keyboard.c; path = ../../src/keyboard.c; sourceTree = ""; }; - 3CDCED750902EA8200B2EF7E /* intervals.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = intervals.c; path = ../../src/intervals.c; sourceTree = ""; }; - 3CDCED760902EA8200B2EF7E /* insdel.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = insdel.c; path = ../../src/insdel.c; sourceTree = ""; }; - 3CDCED770902EA8200B2EF7E /* indent.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = indent.c; path = ../../src/indent.c; sourceTree = ""; }; - 3CDCED780902EA8200B2EF7E /* image.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = image.c; path = ../../src/image.c; sourceTree = ""; }; - 3CDCED7A0902EA8200B2EF7E /* cmds.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = cmds.c; path = ../../src/cmds.c; sourceTree = ""; }; - 3CDCED7B0902EA8200B2EF7E /* category.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = category.c; path = ../../src/category.c; sourceTree = ""; }; - 3CDCED7C0902EA8200B2EF7E /* coding.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = coding.c; path = ../../src/coding.c; sourceTree = ""; }; - 3CDCED830902EA8200B2EF7E /* unexmacosx.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = unexmacosx.c; path = ../../src/unexmacosx.c; sourceTree = ""; }; - 3CDCED8B0902EA8200B2EF7E /* buffer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = buffer.c; path = ../../src/buffer.c; sourceTree = ""; }; - 3CDCED8C0902EA8200B2EF7E /* character.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = character.c; path = ../../src/character.c; sourceTree = ""; }; - 3CDCED920902EA8200B2EF7E /* undo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = undo.c; path = ../../src/undo.c; sourceTree = ""; }; - 3CDCED940902EA8200B2EF7E /* textprop.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = textprop.c; path = ../../src/textprop.c; sourceTree = ""; }; - 3CDCED950902EA8200B2EF7E /* terminfo.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = terminfo.c; path = ../../src/terminfo.c; sourceTree = ""; }; - 3CDCED9C0902EA8200B2EF7E /* xfaces.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = xfaces.c; path = ../../src/xfaces.c; sourceTree = ""; }; - 3CDCED9D0902EA8200B2EF7E /* xdisp.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = xdisp.c; path = ../../src/xdisp.c; sourceTree = ""; }; - 3CDCED9E0902EA8200B2EF7E /* window.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = window.c; path = ../../src/window.c; sourceTree = ""; }; - 3CDCEDB00902EA8200B2EF7E /* doprnt.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = doprnt.c; path = ../../src/doprnt.c; sourceTree = ""; }; - 3CDCEDB10902EA8200B2EF7E /* doc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = doc.c; path = ../../src/doc.c; sourceTree = ""; }; - 3CDCEDB20902EA8200B2EF7E /* dired.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dired.c; path = ../../src/dired.c; sourceTree = ""; }; - 3CDCEDB30902EA8200B2EF7E /* data.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = data.c; path = ../../src/data.c; sourceTree = ""; }; - 3CDCEDB40902EA8200B2EF7E /* callint.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = callint.c; path = ../../src/callint.c; sourceTree = ""; }; - 3CDCEDB60902EA8200B2EF7E /* ccl.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = ccl.c; path = ../../src/ccl.c; sourceTree = ""; }; - 3CDCEDB70902EA8200B2EF7E /* fontset.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fontset.c; path = ../../src/fontset.c; sourceTree = ""; }; - 3CDCEDB80902EA8200B2EF7E /* fns.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fns.c; path = ../../src/fns.c; sourceTree = ""; }; - 3CDCEDB90902EA8200B2EF7E /* floatfns.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = floatfns.c; path = ../../src/floatfns.c; sourceTree = ""; }; - 3CDCEDBB0902EA8200B2EF7E /* filemode.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = filemode.c; path = ../../src/filemode.c; sourceTree = ""; }; - 3CDCEDBC0902EA8200B2EF7E /* filelock.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = filelock.c; path = ../../src/filelock.c; sourceTree = ""; }; - 3CDCEDBD0902EA8200B2EF7E /* emacs.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = emacs.c; path = ../../src/emacs.c; sourceTree = ""; }; - 3CDCEDBE0902EA8200B2EF7E /* editfns.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = editfns.c; path = ../../src/editfns.c; sourceTree = ""; }; - 3CDCEDBF0902EA8200B2EF7E /* fileio.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fileio.c; path = ../../src/fileio.c; sourceTree = ""; }; - 3CDCEDC00902EA8200B2EF7E /* eval.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = eval.c; path = ../../src/eval.c; sourceTree = ""; }; - 3CDCEDC10902EA8200B2EF7E /* casetab.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = casetab.c; path = ../../src/casetab.c; sourceTree = ""; }; - 3CDCEDC20902EA8200B2EF7E /* composite.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = composite.c; path = ../../src/composite.c; sourceTree = ""; }; - 3CDCEDC30902EA8200B2EF7E /* dispnew.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = dispnew.c; path = ../../src/dispnew.c; sourceTree = ""; }; - 3CDCEDC40902EA8200B2EF7E /* charset.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = charset.c; path = ../../src/charset.c; sourceTree = ""; }; - 3CDCEDC50902EA8200B2EF7E /* alloc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = alloc.c; path = ../../src/alloc.c; sourceTree = ""; }; - 3CDCEDC60902EA8200B2EF7E /* bytecode.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = bytecode.c; path = ../../src/bytecode.c; sourceTree = ""; }; - 3CDCEDC70902EA8200B2EF7E /* callproc.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = callproc.c; path = ../../src/callproc.c; sourceTree = ""; }; - 3CDCEDC80902EA8200B2EF7E /* cm.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = cm.c; path = ../../src/cm.c; sourceTree = ""; }; - 3CDCEDC90902EA8200B2EF7E /* casefiddle.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = casefiddle.c; path = ../../src/casefiddle.c; sourceTree = ""; }; - 3CDCEDCA0902EA8200B2EF7E /* fringe.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = fringe.c; path = ../../src/fringe.c; sourceTree = ""; }; - 3CDCEDCB0902EA8200B2EF7E /* frame.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = frame.c; path = ../../src/frame.c; sourceTree = ""; }; - 3CDCEDCC0902EA8200B2EF7E /* chartab.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = chartab.c; path = ../../src/chartab.c; sourceTree = ""; }; - 3CDCEDCD0902EA8200B2EF7E /* atimer.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; name = atimer.c; path = ../../src/atimer.c; sourceTree = ""; }; - 3CED87260FBE696B005ACB89 /* lisp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = lisp.h; path = ../../src/lisp.h; sourceTree = SOURCE_ROOT; }; - 3CED87280FBE6993005ACB89 /* menu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = menu.h; path = ../../src/menu.h; sourceTree = SOURCE_ROOT; }; - 3CED87330FC0F557005ACB89 /* temacs */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = temacs; sourceTree = BUILT_PRODUCTS_DIR; }; - 3CFDFC3A08E79A6800B05918 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /Developer/SDKs/MacOSX10.3.9.sdk/System/Library/Frameworks/AppKit.framework; sourceTree = ""; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 3CED87310FC0F557005ACB89 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 3CED88190FC0F5B3005ACB89 /* AppKit.framework in Frameworks */, - 3C3AF9D50FC10D85001240E9 /* libncurses.dylib in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 19C28FACFE9D520D11CA2CBB /* Products */ = { - isa = PBXGroup; - children = ( - 3CC5434C07E2315800C271A9 /* Emacs.app */, - 3CED87330FC0F557005ACB89 /* temacs */, - ); - name = Products; - sourceTree = ""; - }; - 289FC26B00C69A287F000001 /* NeXTstep */ = { - isa = PBXGroup; - children = ( - 3C4D6D710DE50D5D00B20D4E /* nsfont.m */, - 3C15C1A70902D97100A8542F /* nsimage.m */, - 3C15C04F0902D89500A8542F /* nsgui.h */, - 3C7F3C3A07EB3B05003C8A4D /* nsterm.h */, - 090AF67E00C61DCD7F000001 /* nsfns.m */, - 090AF68000C61DCD7F000001 /* nsmenu.m */, - 090AF68100C61DCD7F000001 /* nsselect.m */, - 090AF68300C61DCD7F000001 /* nsterm.m */, - ); - name = NeXTstep; - sourceTree = ""; - }; - 29B97314FDCFA39411CA2CEA /* Emacs */ = { - isa = PBXGroup; - children = ( - 289FC26B00C69A287F000001 /* NeXTstep */, - 3C15C23E0902E6B000A8542F /* emacs-hdr */, - 3CDCED4D0902EA6800B2EF7E /* emacs-src */, - 29B97317FDCFA39411CA2CEA /* Resources */, - 29B97323FDCFA39411CA2CEA /* Frameworks */, - 19C28FACFE9D520D11CA2CBB /* Products */, - ); - name = Emacs; - sourceTree = ""; - }; - 29B97317FDCFA39411CA2CEA /* Resources */ = { - isa = PBXGroup; - children = ( - 3CB8E2A40E2CE856003F3104 /* English.lproj */, - 3CB8E29F0E2CE7F5003F3104 /* Credits.html */, - 739637F200C4DF3C7F000001 /* Images */, - ); - name = Resources; - sourceTree = ""; - }; - 29B97323FDCFA39411CA2CEA /* Frameworks */ = { - isa = PBXGroup; - children = ( - 3C3AF9D40FC10D85001240E9 /* libncurses.dylib */, - 3CFDFC3A08E79A6800B05918 /* AppKit.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - 3C15C23E0902E6B000A8542F /* emacs-hdr */ = { - isa = PBXGroup; - children = ( - 3CED87280FBE6993005ACB89 /* menu.h */, - 3CED87260FBE696B005ACB89 /* lisp.h */, - 3C4D6D670DE50D2300B20D4E /* font.h */, - 3C15C0E60902D89500A8542F /* atimer.h */, - 3C15C0E70902D89500A8542F /* blockinput.h */, - 3C15C0780902D89500A8542F /* buffer.h */, - 3C15C0760902D89500A8542F /* category.h */, - 3C15C0C50902D89500A8542F /* ccl.h */, - 3C15C0DE0902D89500A8542F /* character.h */, - 3C15C0C80902D89500A8542F /* charset.h */, - 3C15C0890902D89500A8542F /* cm.h */, - 3CDCED330902E99700B2EF7E /* config.h */, - 3C15C0770902D89500A8542F /* coding.h */, - 3C15C0D70902D89500A8542F /* commands.h */, - 3C15C0C70902D89500A8542F /* composite.h */, - 3C15C0D90902D89500A8542F /* dispextern.h */, - 3C15C0BF0902D89500A8542F /* disptab.h */, - 3C15C0C20902D89500A8542F /* epaths.h */, - 3C15C0C90902D89500A8542F /* fontset.h */, - 3C15C0E40902D89500A8542F /* frame.h */, - 3C15C0B80902D89500A8542F /* getpagesize.h */, - 3C15C06E0902D89500A8542F /* indent.h */, - 3C15C06B0902D89500A8542F /* intervals.h */, - 3C15C0660902D89500A8542F /* keymap.h */, - 3C15C0680902D89500A8542F /* keyboard.h */, - 3C15C05D0902D89500A8542F /* macros.h */, - 3C15C0560902D89500A8542F /* md5.h */, - 3C15C0550902D89500A8542F /* mem-limits.h */, - 3C15C0500902D89500A8542F /* ndir.h */, - 3C15C04C0902D89500A8542F /* point.h */, - 3C15C0470902D89500A8542F /* process.h */, - 3C15C0460902D89500A8542F /* puresize.h */, - 3C15C0430902D89500A8542F /* regex.h */, - 3C15C0410902D89500A8542F /* region-cache.h */, - 3C15C0390902D89500A8542F /* syntax.h */, - 3C15C0370902D89500A8542F /* sysselect.h */, - 3C15C0330902D89500A8542F /* syswait.h */, - 3C15C0360902D89500A8542F /* syssignal.h */, - 3C15C0350902D89500A8542F /* systime.h */, - 3C15C0340902D89500A8542F /* systty.h */, - 3C15C0300902D89500A8542F /* termchar.h */, - 3C15C02F0902D89500A8542F /* termhooks.h */, - 3C15C0950902D89500A8542F /* termopts.h */, - 3C15C0A00902D89500A8542F /* window.h */, - ); - name = "emacs-hdr"; - sourceTree = ""; - }; - 3CB8E2A40E2CE856003F3104 /* English.lproj */ = { - isa = PBXGroup; - children = ( - 3CB8E2A50E2CE856003F3104 /* InfoPlist.strings */, - ); - name = English.lproj; - path = Emacs.base/Contents/Resources/English.lproj; - sourceTree = ""; - }; - 3CDCED4D0902EA6800B2EF7E /* emacs-src */ = { - isa = PBXGroup; - children = ( - 3C3AF9C90FC10CDF001240E9 /* menu.c */, - 3C4D6D660DE50D2300B20D4E /* font.c */, - 3C4D6D690DE50D2300B20D4E /* terminal.c */, - 3CDCED550902EA8100B2EF7E /* term.c */, - 3CDCED560902EA8100B2EF7E /* sysdep.c */, - 3CDCED570902EA8100B2EF7E /* syntax.c */, - 3CDCED590902EA8100B2EF7E /* strftime.c */, - 3CDCED5A0902EA8100B2EF7E /* sound.c */, - 3CDCED5C0902EA8100B2EF7E /* search.c */, - 3CDCED5D0902EA8100B2EF7E /* scroll.c */, - 3CDCED5E0902EA8100B2EF7E /* region-cache.c */, - 3CDCED5F0902EA8100B2EF7E /* regex.c */, - 3CDCED610902EA8100B2EF7E /* process.c */, - 3CDCED620902EA8100B2EF7E /* print.c */, - 3CDCED640902EA8100B2EF7E /* pre-crt0.c */, - 3CDCED670902EA8100B2EF7E /* minibuf.c */, - 3CDCED680902EA8100B2EF7E /* md5.c */, - 3CDCED690902EA8100B2EF7E /* marker.c */, - 3CDCED6D0902EA8100B2EF7E /* macros.c */, - 3CDCED710902EA8100B2EF7E /* lread.c */, - 3CDCED720902EA8100B2EF7E /* lastfile.c */, - 3CDCED730902EA8100B2EF7E /* keymap.c */, - 3CDCED740902EA8200B2EF7E /* keyboard.c */, - 3CDCED750902EA8200B2EF7E /* intervals.c */, - 3CDCED760902EA8200B2EF7E /* insdel.c */, - 3CDCED770902EA8200B2EF7E /* indent.c */, - 3CDCED780902EA8200B2EF7E /* image.c */, - 3CDCED7A0902EA8200B2EF7E /* cmds.c */, - 3CDCED7B0902EA8200B2EF7E /* category.c */, - 3CDCED7C0902EA8200B2EF7E /* coding.c */, - 3CDCED830902EA8200B2EF7E /* unexmacosx.c */, - 3CDCED8B0902EA8200B2EF7E /* buffer.c */, - 3CDCED8C0902EA8200B2EF7E /* character.c */, - 3CDCED920902EA8200B2EF7E /* undo.c */, - 3CDCED940902EA8200B2EF7E /* textprop.c */, - 3CDCED950902EA8200B2EF7E /* terminfo.c */, - 3CDCED9C0902EA8200B2EF7E /* xfaces.c */, - 3CDCED9D0902EA8200B2EF7E /* xdisp.c */, - 3CDCED9E0902EA8200B2EF7E /* window.c */, - 3CDCEDB00902EA8200B2EF7E /* doprnt.c */, - 3CDCEDB10902EA8200B2EF7E /* doc.c */, - 3CDCEDB20902EA8200B2EF7E /* dired.c */, - 3CDCEDB30902EA8200B2EF7E /* data.c */, - 3CDCEDB40902EA8200B2EF7E /* callint.c */, - 3CDCEDB60902EA8200B2EF7E /* ccl.c */, - 3CDCEDB70902EA8200B2EF7E /* fontset.c */, - 3CDCEDB80902EA8200B2EF7E /* fns.c */, - 3CDCEDB90902EA8200B2EF7E /* floatfns.c */, - 3CDCEDBB0902EA8200B2EF7E /* filemode.c */, - 3CDCEDBC0902EA8200B2EF7E /* filelock.c */, - 3CDCEDBD0902EA8200B2EF7E /* emacs.c */, - 3CDCEDBE0902EA8200B2EF7E /* editfns.c */, - 3CDCEDBF0902EA8200B2EF7E /* fileio.c */, - 3CDCEDC00902EA8200B2EF7E /* eval.c */, - 3CDCEDC10902EA8200B2EF7E /* casetab.c */, - 3CDCEDC20902EA8200B2EF7E /* composite.c */, - 3CDCEDC30902EA8200B2EF7E /* dispnew.c */, - 3CDCEDC40902EA8200B2EF7E /* charset.c */, - 3CDCEDC50902EA8200B2EF7E /* alloc.c */, - 3CDCEDC60902EA8200B2EF7E /* bytecode.c */, - 3CDCEDC70902EA8200B2EF7E /* callproc.c */, - 3CDCEDC80902EA8200B2EF7E /* cm.c */, - 3CDCEDC90902EA8200B2EF7E /* casefiddle.c */, - 3CDCEDCA0902EA8200B2EF7E /* fringe.c */, - 3CDCEDCB0902EA8200B2EF7E /* frame.c */, - 3CDCEDCC0902EA8200B2EF7E /* chartab.c */, - 3CDCEDCD0902EA8200B2EF7E /* atimer.c */, - ); - name = "emacs-src"; - sourceTree = ""; - }; - 739637F200C4DF3C7F000001 /* Images */ = { - isa = PBXGroup; - children = ( - 3CB8E29D0E2CE73A003F3104 /* Emacs.icns */, - ); - name = Images; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 3CC542FE07E2315800C271A9 /* Emacs */ = { - isa = PBXNativeTarget; - buildConfigurationList = 3CA115970C825A540007AFC2 /* Build configuration list for PBXNativeTarget "Emacs" */; - buildPhases = ( - 3CED88240FC0FE7C005ACB89 /* ShellScript */, - 3CED883D0FC0FF6E005ACB89 /* ShellScript */, - ); - buildRules = ( - ); - dependencies = ( - 3CED88230FC0FE5C005ACB89 /* PBXTargetDependency */, - ); - name = Emacs; - productInstallPath = "$(HOME)/Applications"; - productName = Emacs; - productReference = 3CC5434C07E2315800C271A9 /* Emacs.app */; - productType = "com.apple.product-type.application"; - }; - 3CED87320FC0F557005ACB89 /* temacs */ = { - isa = PBXNativeTarget; - buildConfigurationList = 3CED87350FC0F576005ACB89 /* Build configuration list for PBXNativeTarget "temacs" */; - buildPhases = ( - 3CED87300FC0F557005ACB89 /* Sources */, - 3CED87310FC0F557005ACB89 /* Frameworks */, - 3CED88460FC100EC005ACB89 /* ShellScript */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = temacs; - productName = "emacs-bin"; - productReference = 3CED87330FC0F557005ACB89 /* temacs */; - productType = "com.apple.product-type.tool"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 29B97313FDCFA39411CA2CEA /* Project object */ = { - isa = PBXProject; - buildConfigurationList = 3CA1159B0C825A540007AFC2 /* Build configuration list for PBXProject "Emacs" */; - hasScannedForEncodings = 1; - mainGroup = 29B97314FDCFA39411CA2CEA /* Emacs */; - projectDirPath = ""; - projectRoot = ../..; - targets = ( - 3CC542FE07E2315800C271A9 /* Emacs */, - 3CED87320FC0F557005ACB89 /* temacs */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXShellScriptBuildPhase section */ - 3CED88240FC0FE7C005ACB89 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# This script sets up the Emacs.app bundle by copying from Cocoa/Emacs.base,\n# and copying the binary emacs. It runs the ns-app target in src/Makefile.\n# This depends on emacs target, so temacs resulting from previous step is\n# dumped into emacs.\n\ncd ../../src\n\nmake ns-app\n"; - }; - 3CED883D0FC0FF6E005ACB89 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 12; - files = ( - ); - inputPaths = ( - ); - outputPaths = ( - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# This script copies the lisp and other files into the bundle\n# (if self-contained configuration was selected at configure time),\n# or the install location (otherwise).\n\n# Xcode was supposed to make this check based on input/output files,\n# but it didn't work for some reason, so run every time and do it ourselves.\nif [ -x ../Emacs.app/Contents/Resources/lisp ]; then\n\texit\nfi\n\ncd ../..\nmake install\nln -sf $BUILD_ROOT/../../Emacs.app $BUILT_PRODUCTS_DIR/Emacs.app\n"; - }; - 3CED88460FC100EC005ACB89 /* ShellScript */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputPaths = ( - "$(BUILT_PRODUCTS_DIR)/temacs", - ); - outputPaths = ( - ../../src/temacs, - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "# Move the build results to emacs src dir so scripts in Emacs target invoking\n# make operations can use them.\n# *.o files included because make-docfile uses object files for some reason\n\ncp -f ${OBJECT_FILE_DIR_normal}/${NATIVE_ARCH_ACTUAL}/*.o ../../src\ncp -f ${BUILT_PRODUCTS_DIR}/temacs ../../src"; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 3CED87300FC0F557005ACB89 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 3CED876D0FC0F581005ACB89 /* pre-crt0.c in Sources */, - 3CED87390FC0F581005ACB89 /* alloc.c in Sources */, - 3CED873A0FC0F581005ACB89 /* atimer.c in Sources */, - 3CED873B0FC0F581005ACB89 /* buffer.c in Sources */, - 3CED873C0FC0F581005ACB89 /* bytecode.c in Sources */, - 3CED873D0FC0F581005ACB89 /* callint.c in Sources */, - 3CED873E0FC0F581005ACB89 /* callproc.c in Sources */, - 3CED873F0FC0F581005ACB89 /* casefiddle.c in Sources */, - 3CED87400FC0F581005ACB89 /* casetab.c in Sources */, - 3CED87410FC0F581005ACB89 /* category.c in Sources */, - 3CED87420FC0F581005ACB89 /* ccl.c in Sources */, - 3CED87430FC0F581005ACB89 /* character.c in Sources */, - 3CED87440FC0F581005ACB89 /* charset.c in Sources */, - 3CED87450FC0F581005ACB89 /* chartab.c in Sources */, - 3CED87460FC0F581005ACB89 /* cm.c in Sources */, - 3CED87470FC0F581005ACB89 /* cmds.c in Sources */, - 3CED87480FC0F581005ACB89 /* coding.c in Sources */, - 3CED87490FC0F581005ACB89 /* composite.c in Sources */, - 3CED874A0FC0F581005ACB89 /* data.c in Sources */, - 3CED874B0FC0F581005ACB89 /* dired.c in Sources */, - 3CED874C0FC0F581005ACB89 /* dispnew.c in Sources */, - 3CED874D0FC0F581005ACB89 /* doc.c in Sources */, - 3CED874E0FC0F581005ACB89 /* doprnt.c in Sources */, - 3CED874F0FC0F581005ACB89 /* editfns.c in Sources */, - 3CED87500FC0F581005ACB89 /* emacs.c in Sources */, - 3CED87510FC0F581005ACB89 /* eval.c in Sources */, - 3CED87520FC0F581005ACB89 /* fileio.c in Sources */, - 3CED87530FC0F581005ACB89 /* filelock.c in Sources */, - 3CED87540FC0F581005ACB89 /* filemode.c in Sources */, - 3CED87550FC0F581005ACB89 /* floatfns.c in Sources */, - 3CED87560FC0F581005ACB89 /* fns.c in Sources */, - 3CED87570FC0F581005ACB89 /* font.c in Sources */, - 3CED87580FC0F581005ACB89 /* fontset.c in Sources */, - 3CED87590FC0F581005ACB89 /* frame.c in Sources */, - 3CED875A0FC0F581005ACB89 /* fringe.c in Sources */, - 3CED875B0FC0F581005ACB89 /* image.c in Sources */, - 3CED875C0FC0F581005ACB89 /* indent.c in Sources */, - 3CED875D0FC0F581005ACB89 /* insdel.c in Sources */, - 3CED875E0FC0F581005ACB89 /* intervals.c in Sources */, - 3CED875F0FC0F581005ACB89 /* keyboard.c in Sources */, - 3CED87600FC0F581005ACB89 /* keymap.c in Sources */, - 3CED87620FC0F581005ACB89 /* lread.c in Sources */, - 3CED87630FC0F581005ACB89 /* macros.c in Sources */, - 3CED87640FC0F581005ACB89 /* marker.c in Sources */, - 3CED87650FC0F581005ACB89 /* md5.c in Sources */, - 3C3AF9CA0FC10CDF001240E9 /* menu.c in Sources */, - 3CED87660FC0F581005ACB89 /* minibuf.c in Sources */, - 3CED87670FC0F581005ACB89 /* nsfns.m in Sources */, - 3CED87680FC0F581005ACB89 /* nsfont.m in Sources */, - 3CED87690FC0F581005ACB89 /* nsimage.m in Sources */, - 3CED876A0FC0F581005ACB89 /* nsmenu.m in Sources */, - 3CED876B0FC0F581005ACB89 /* nsselect.m in Sources */, - 3CED876C0FC0F581005ACB89 /* nsterm.m in Sources */, - 3CED876E0FC0F581005ACB89 /* print.c in Sources */, - 3CED876F0FC0F581005ACB89 /* process.c in Sources */, - 3CED87700FC0F581005ACB89 /* regex.c in Sources */, - 3CED87710FC0F581005ACB89 /* region-cache.c in Sources */, - 3CED87720FC0F581005ACB89 /* scroll.c in Sources */, - 3CED87730FC0F581005ACB89 /* search.c in Sources */, - 3CED87740FC0F581005ACB89 /* sound.c in Sources */, - 3CED87750FC0F581005ACB89 /* strftime.c in Sources */, - 3CED87760FC0F581005ACB89 /* syntax.c in Sources */, - 3CED87770FC0F581005ACB89 /* sysdep.c in Sources */, - 3CED87780FC0F581005ACB89 /* term.c in Sources */, - 3CED877A0FC0F581005ACB89 /* terminal.c in Sources */, - 3CED877B0FC0F581005ACB89 /* terminfo.c in Sources */, - 3CED877C0FC0F581005ACB89 /* textprop.c in Sources */, - 3CED877E0FC0F581005ACB89 /* undo.c in Sources */, - 3CED877F0FC0F581005ACB89 /* unexmacosx.c in Sources */, - 3CED87800FC0F581005ACB89 /* window.c in Sources */, - 3CED87810FC0F581005ACB89 /* xdisp.c in Sources */, - 3CED87820FC0F581005ACB89 /* xfaces.c in Sources */, - 3CED87610FC0F581005ACB89 /* lastfile.c in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin PBXTargetDependency section */ - 3CED88230FC0FE5C005ACB89 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 3CED87320FC0F557005ACB89 /* temacs */; - targetProxy = 3CED88220FC0FE5C005ACB89 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - -/* Begin PBXVariantGroup section */ - 3CB8E2A50E2CE856003F3104 /* InfoPlist.strings */ = { - isa = PBXVariantGroup; - children = ( - 3CB8E2A60E2CE856003F3104 /* English */, - ); - name = InfoPlist.strings; - sourceTree = ""; - }; -/* End PBXVariantGroup section */ - -/* Begin XCBuildConfiguration section */ - 3CA115980C825A540007AFC2 /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = Emacs; - WRAPPER_EXTENSION = app; - }; - name = Development; - }; - 3CA115990C825A540007AFC2 /* Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = Emacs; - WRAPPER_EXTENSION = app; - }; - name = Deployment; - }; - 3CA1159A0C825A540007AFC2 /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - PRODUCT_NAME = Emacs; - WRAPPER_EXTENSION = app; - }; - name = Default; - }; - 3CA1159C0C825A540007AFC2 /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - MACOSX_DEPLOYMENT_TARGET = ""; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; - }; - name = Development; - }; - 3CA1159D0C825A540007AFC2 /* Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - MACOSX_DEPLOYMENT_TARGET = ""; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; - }; - name = Deployment; - }; - 3CA1159E0C825A540007AFC2 /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - MACOSX_DEPLOYMENT_TARGET = ""; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; - }; - name = Default; - }; - 3CED87360FC0F576005ACB89 /* Development */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = NO; - GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_MODEL_TUNING = G5; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - emacs, - temacs, - HAVE_CONFIG_H, - ); - OTHER_LDFLAGS = ( - "-Xlinker", - "-headerpad", - "-Xlinker", - 6C8, - ); - PREBINDING = NO; - PRODUCT_NAME = temacs; - WARNING_CFLAGS = "-Wno-pointer-sign"; - ZERO_LINK = NO; - }; - name = Development; - }; - 3CED87370FC0F576005ACB89 /* Deployment */ = { - isa = XCBuildConfiguration; - buildSettings = { - COPY_PHASE_STRIP = YES; - GCC_ENABLE_FIX_AND_CONTINUE = NO; - GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - GCC_MODEL_TUNING = G5; - GCC_PREPROCESSOR_DEFINITIONS = ( - emacs, - temacs, - HAVE_CONFIG_H, - ); - OTHER_LDFLAGS = ( - "-Xlinker", - "-headerpad", - "-Xlinker", - 6C8, - ); - PREBINDING = NO; - PRODUCT_NAME = temacs; - WARNING_CFLAGS = "-Wno-pointer-sign"; - ZERO_LINK = NO; - }; - name = Deployment; - }; - 3CED87380FC0F576005ACB89 /* Default */ = { - isa = XCBuildConfiguration; - buildSettings = { - GCC_ENABLE_FIX_AND_CONTINUE = YES; - GCC_MODEL_TUNING = G5; - GCC_PREPROCESSOR_DEFINITIONS = ( - emacs, - temacs, - HAVE_CONFIG_H, - ); - OTHER_LDFLAGS = ( - "-Xlinker", - "-headerpad", - "-Xlinker", - 6C8, - ); - PREBINDING = NO; - PRODUCT_NAME = temacs; - WARNING_CFLAGS = "-Wno-pointer-sign"; - ZERO_LINK = YES; - }; - name = Default; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 3CA115970C825A540007AFC2 /* Build configuration list for PBXNativeTarget "Emacs" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3CA115980C825A540007AFC2 /* Development */, - 3CA115990C825A540007AFC2 /* Deployment */, - 3CA1159A0C825A540007AFC2 /* Default */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Default; - }; - 3CA1159B0C825A540007AFC2 /* Build configuration list for PBXProject "Emacs" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3CA1159C0C825A540007AFC2 /* Development */, - 3CA1159D0C825A540007AFC2 /* Deployment */, - 3CA1159E0C825A540007AFC2 /* Default */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Default; - }; - 3CED87350FC0F576005ACB89 /* Build configuration list for PBXNativeTarget "temacs" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3CED87360FC0F576005ACB89 /* Development */, - 3CED87370FC0F576005ACB89 /* Deployment */, - 3CED87380FC0F576005ACB89 /* Default */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Default; - }; -/* End XCConfigurationList section */ - }; - rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; -} ------------------------------------------------------------ revno: 106110 committer: Chong Yidong branch nick: trunk timestamp: Mon 2011-10-17 21:42:28 -0400 message: Edits to Display chapter of Emacs manual. * doc/emacs/display.texi (Faces): Simplify discussion. Move documentation of list-faces-display here, from Standard Faces node. Note special role of `default' background. (Standard Faces): Note special role of `default' background. Note that region face may be taken fom GTK. Add xref to Text Display. (Text Scale): Rename from "Temporary Face Changes". Callers changed. Don't bother documenting variable-pitch-mode. (Font Lock): Copyedits. Remove font-lock-maximum-size. (Useless Whitespace): Simplify description of delete-trailing-whitespace. Note active region case. (Text Display): Fix description of escape-glyph face assignment. Remove unibye mode discussion. Update some parts for Unicode. Move glyphless chars documentation to Lisp manual. * doc/emacs/frames.texi (Tooltips): Document x-gtk-use-system-tooltips. * doc/lispref/display.texi (Glyphless Chars): New node. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2011-10-15 16:37:45 +0000 +++ doc/emacs/ChangeLog 2011-10-18 01:42:28 +0000 @@ -1,3 +1,21 @@ +2011-10-18 Chong Yidong + + * display.texi (Faces): Simplify discussion. Move documentation + of list-faces-display here, from Standard Faces node. Note + special role of `default' background. + (Standard Faces): Note special role of `default' background. Note + that region face may be taken fom GTK. Add xref to Text Display. + (Text Scale): Rename from "Temporary Face Changes". Callers + changed. Don't bother documenting variable-pitch-mode. + (Font Lock): Copyedits. Remove font-lock-maximum-size. + (Useless Whitespace): Simplify description of + delete-trailing-whitespace. Note active region case. + (Text Display): Fix description of escape-glyph face assignment. + Remove unibye mode discussion. Update some parts for Unicode. + Move glyphless chars documentation to Lisp manual. + + * frames.texi (Tooltips): Document x-gtk-use-system-tooltips. + 2011-10-15 Chong Yidong * display.texi (Scrolling): Tweak explanation of scroll direction. === modified file 'doc/emacs/basic.texi' --- doc/emacs/basic.texi 2011-10-08 16:37:46 +0000 +++ doc/emacs/basic.texi 2011-10-18 01:42:28 +0000 @@ -109,7 +109,7 @@ code-point, it should be a hexadecimal number (which is the convention for Unicode). The command then inserts the corresponding character into the buffer. For example, both of the following insert the -infinity sign (Unicode code-point @code{#x221E}): +infinity sign (Unicode code-point @code{U+221E}): @example @kbd{C-x 8 @key{RET} infinity @key{RET}} === modified file 'doc/emacs/display.texi' --- doc/emacs/display.texi 2011-10-15 16:38:45 +0000 +++ doc/emacs/display.texi 2011-10-18 01:42:28 +0000 @@ -21,7 +21,7 @@ * Follow Mode:: Follow mode lets two windows scroll as one. * Faces:: How to change the display style using faces. * Standard Faces:: Emacs' predefined faces. -* Temporary Face Changes:: Commands to temporarily modify the default text face +* Text Scale:: Increasing or decreasing text size in a buffer. * Font Lock:: Minor mode for syntactic highlighting using faces. * Highlight Interactively:: Tell Emacs what text to highlight. * Fringes:: Enabling or disabling window fringes. @@ -55,7 +55,7 @@ was taken up by Emacs before the modern meaning of ``scrolling up'' and ``scrolling down'' became widely adopted. Hence the strange result that @key{PageDown} scrolls ``up'' in the Emacs sense. In this -manual, we refer to scrolling ``foward'' and ``backward'' where +manual, we refer to scrolling ``forward'' and ``backward'' where possible, in order to minimize confusion. The portion of a buffer displayed in a window always contains point. @@ -439,76 +439,69 @@ @section Faces: Controlling Text Display Style @cindex faces - Emacs can display text in several different styles, which are called + Emacs can display text in several different styles, called @dfn{faces}. Each face can specify various @dfn{face attributes}, -such as the font, height, weight and slant, the foreground and -background color, and underlining or overlining. A face does not have -to specify all of these attributes; often it inherits most of them -from another face. - - On a text-only terminal, not all face attributes are meaningful. -Some text-only terminals support inverse video, bold, and underline -attributes; some support colors. Text-only terminals generally do not -support changing the height, width or font. - - Most major modes assign faces to the text automatically through the -work of Font Lock mode. @xref{Font Lock}, for more information about -Font Lock mode and syntactic highlighting. You can print the current -buffer with the highlighting that appears on your screen using the -command @code{ps-print-buffer-with-faces}. @xref{PostScript}. - - Enriched mode, the mode for editing formatted text, provides -commands and menus for specifying faces for text in the buffer. -@xref{Format Faces}. +such as the font, height, weight, slant, foreground and background +color, and underlining or overlining. Most major modes assign faces +to the text automatically, via Font Lock mode. @xref{Font Lock}, for +more information about how these faces are assigned. + +@findex list-faces-display + To see what faces are currently defined, and what they look like, +type @kbd{M-x list-faces-display}. With a prefix argument, this +prompts for a regular expression, and displays only faces with names +matching that regular expression (@pxref{Regexps}). + + It's possible for a given face to look different in different +frames. For instance, some text-only terminals do not support all +face attributes, particularly font, height, and width, and some +support a limited range of colors. The @code{list-faces-display} +command shows the appearance for the selected frame. @cindex face colors, setting - To alter the appearance of a face, use the customization buffer. -@xref{Face Customization}. You can also use X resources to specify -attributes of any particular face (@pxref{Resources}). When -displaying a character, any attribute that isn't specified by its face -is taken from the @code{default} face, whose attributes reflect the -default settings of the frame itself. +@cindex background color +@cindex default face + You can customize a face to alter its appearance, and save those +changes for future Emacs sessions. @xref{Face Customization}. A face +does not have to specify every single attribute; often it inherits +most attributes from another face. Any ultimately unspecified +attribute is taken from a face named @code{default}, whose attributes +are all specified. The @code{default} face is the default for +displaying text, and its background color is also used as the frame's +background color. + + You can also use X resources to specify attributes of any particular +face. @xref{Resources}. @findex set-face-foreground @findex set-face-background - You can also change the foreground and background colors of a -specific face with @kbd{M-x set-face-foreground} and @kbd{M-x -set-face-background}. These commands prompt in the minibuffer for a -face name and a color name, with completion, and then set that face to -use the specified color. @xref{Face Customization}, for information -about color names. These commands affect the face colors on all -frames, both existing and those to be created in the future. These -changes do not, however, persist for future Emacs sessions; to make -lasting changes, use the customization buffer (@pxref{Face -Customization}). - - You can also set foreground and background colors for the current -frame only; see @ref{Frame Parameters}. - - Emacs can display variable-width fonts, but some of the Emacs -commands that calculate width and indentation do not know how to -calculate variable widths. This can sometimes lead to incorrect -results when you use variable-width fonts. In particular, indentation -commands can give inconsistent results, so we recommend you avoid -variable-width fonts, especially for editing program source code. + You can also change the foreground and background colors of a face +with @kbd{M-x set-face-foreground} and @kbd{M-x set-face-background}. +These commands prompt in the minibuffer for a face name and a color +name, with completion, and then set that face to use the specified +color (@pxref{Face Customization}, for information about color names). +They affect the face colors on all frames, but their effects do not +persist for future Emacs sessions, unlike using the customization +buffer or X resources. You can also use frame parameters to set +foreground and background colors for a specific frame; see @ref{Frame +Parameters}. + + Emacs can display variable-width fonts, but some Emacs commands, +particularly indentation commands, do not account for variable +character display widths. Therefore, we recommend not using +variable-width fonts for most faces, particularly those assigned by +Font Lock mode. @node Standard Faces @section Standard Faces -@findex list-faces-display - To see what faces are currently defined, and what they look like, -type @kbd{M-x list-faces-display}. It's possible for a given face to -look different in different frames; this command shows the appearance -in the frame in which you type it. With a prefix argument, this -prompts for a regular expression, and displays only faces with names -matching that regular expression. - Here are the standard faces for specifying text appearance. You can apply them to specific text when you want the effects they produce. @table @code @item default This face is used for ordinary text that doesn't specify any face. +Its background color is used as the frame's background color. @item bold This face uses a bold variant of the default font. @item italic @@ -535,37 +528,38 @@ @table @code @item highlight -This face is used for highlighting portions of text, in various modes. -For example, mouse-sensitive text is highlighted using this face. +This face is used for text highlighting in various contexts, such as +when the mouse cursor is moved over a hyperlink. @item isearch -This face is used for highlighting the current Isearch match +This face is used to highlight the current Isearch match (@pxref{Incremental Search}). @item query-replace -This face is used for highlighting the current Query Replace match +This face is used to highlight the current Query Replace match (@pxref{Replace}). @item lazy-highlight -This face is used for lazy highlighting of Isearch and Query Replace -matches other than the current one. +This face is used to highlight ``lazy matches'' for Isearch and Query +Replace (matches other than the current one). @item region -This face is used for displaying a selected region (@pxref{Mark}). +This face is used for displaying an active region (@pxref{Mark}). +When Emacs is built with GTK support, its colors are taken from the +current GTK theme. @item secondary-selection This face is used for displaying a secondary X selection (@pxref{Secondary Selection}). @item trailing-whitespace The face for highlighting excess spaces and tabs at the end of a line -when @code{show-trailing-whitespace} is non-@code{nil}; see -@ref{Useless Whitespace}. +when @code{show-trailing-whitespace} is non-@code{nil} (@pxref{Useless +Whitespace}). +@item escape-glyph +The face for displaying control characters and escape sequences +(@pxref{Text Display}). @item nobreak-space -The face for displaying the character ``nobreak space.'' -@item escape-glyph -The face for highlighting the @samp{\} or @samp{^} that indicates -a control character. It's also used when @samp{\} indicates a -nobreak space or nobreak (soft) hyphen. +The face for displaying ``non-breaking'' space characters (@pxref{Text +Display}). @end table - These faces control the appearance of parts of the Emacs frame. -They exist as faces to provide a consistent way to customize the -appearance of these parts of the frame. + The following faces control the appearance of parts of the Emacs +frame: @table @code @item mode-line @@ -588,11 +582,8 @@ Most windows do not have a header line---only some special modes, such Info mode, create one. @item vertical-border -This face is used for the vertical divider between windows. -By default this face inherits from the @code{mode-line-inactive} face -on character terminals. On graphical displays the foreground color of -this face is used for the vertical line between windows without -scrollbars. +This face is used for the vertical divider between windows on +text-only terminals. @item minibuffer-prompt @cindex @code{minibuffer-prompt} face @vindex minibuffer-prompt-properties @@ -607,35 +598,37 @@ displays. (The fringes are the narrow portions of the Emacs frame between the text area and the window's right and left borders.) @xref{Fringes}. +@item cursor +This face determines the color of the text cursor. +@item tooltip +This face is used for tooltip text. By default, if Emacs is built +with GTK support, tooltips are drawn via GTK and this face has no +effect. @xref{Tooltips}. +@item mouse +This face determines the color of the mouse pointer. +@end table + + The following faces likewise control the appearance of parts of the +Emacs frame, but only on text-only terminals, or when Emacs is built +on X with no toolkit support. (For all other cases, the appearance of +the respective frame elements is determined by system-wide settings.) + +@table @code @item scroll-bar This face determines the visual appearance of the scroll bar. @xref{Scroll Bars}. -@item border -This face determines the color of the frame border. -@item cursor -This face determines the color of the cursor. -@item mouse -This face determines the color of the mouse pointer. @item tool-bar This face determines the color of tool bar icons. @xref{Tool Bars}. -@item tooltip -This face is used for tooltips. @xref{Tooltips}. @item menu @cindex menu bar appearance @cindex @code{menu} face, no effect if customized @cindex customization of @code{menu} face This face determines the colors and font of Emacs's menus. @xref{Menu -Bars}. This has no effect in Emacs built with GTK and in the -MS-Windows/Mac ports; you need to use system-wide styles and options -to change the appearance of GTK, Windows, or Mac menus. Setting the -font of LessTif/Motif menus is currently not supported; attempts to -set the font are ignored in this case. +Bars}. @end table -@node Temporary Face Changes -@section Temporary Face Changes - -The following commands change the default face within a buffer. +@node Text Scale +@section Text Scale @cindex adjust buffer face height @findex text-scale-adjust @@ -652,9 +645,11 @@ The final key of these commands may be repeated without the leading @kbd{C-x}. For instance, @kbd{C-x C-= C-= C-=} increases the face -height by three steps. Each step scales the height of the default -face by the value of the variable @code{text-scale-mode-step}. As a -special case, an argument of 0 removes any scaling currently active. +height by three steps. Each step scales the text height by a factor +of 1.2; to change this factor, customize the variable +@code{text-scale-mode-step}. As an exception, a numeric argument of 0 +to the @code{text-scale-adjust} command restores the default height, +similar to typing @kbd{C-x C-0}. @cindex increase buffer face height @findex text-scale-increase @@ -668,21 +663,14 @@ @cindex set buffer face height @findex text-scale-set -The command @code{text-scale-set} sets the height of the default face -in the current buffer to an absolute level specified by its prefix -argument. + The command @code{text-scale-set} scales the height of the default +face in the current buffer to an absolute level specified by its +prefix argument. @findex text-scale-mode - The above commands automatically enable or disable the minor mode -@code{text-scale-mode}, depending on whether the current font scaling -is other than 1 or not. - -@cindex variable pitch mode -@findex variable-pitch-mode - To temporarily change the face in the current buffer to a -variable-pitch (``proportional'') font, use the command @kbd{M-x -variable-pitch-mode} to enable or disable the Variable Pitch minor -mode. + The above commands automatically enable the minor mode +@code{text-scale-mode} if the current font scaling is other than 1, +and disable it otherwise. @node Font Lock @section Font Lock mode @@ -691,41 +679,36 @@ @cindex syntax highlighting and coloring Font Lock mode is a minor mode, always local to a particular buffer, -which highlights (or ``fontifies'') the buffer contents according to -the syntax of the text you are editing. It can recognize comments and -strings in most programming languages; in several languages, it can -also recognize and properly highlight various other important -constructs, such as names of functions being defined or reserved -keywords. Some special modes, such as Occur mode and Info mode, have -completely specialized ways of assigning fonts for Font Lock mode. +which assigns faces to (or @dfn{fontifies}) the text in the buffer. +Each buffer's major mode tells Font Lock mode which text to fontify; +for instance, programming language modes fontify syntactically +relevant constructs like comments, strings, and function names. @findex font-lock-mode - Font Lock mode is turned on by default in all modes which support it. -You can toggle font-lock for each buffer with the command @kbd{M-x -font-lock-mode}. Using a positive argument unconditionally turns Font -Lock mode on, and a negative or zero argument turns it off. + Font Lock mode is enabled by default. To toggle it in the current +buffer, type @kbd{M-x font-lock-mode}. A positive numeric argument +unconditionally enables Font Lock mode, and a negative or zero +argument disables it. @findex global-font-lock-mode @vindex global-font-lock-mode - If you do not wish Font Lock mode to be turned on by default, -customize the variable @code{global-font-lock-mode} using the Customize -interface (@pxref{Easy Customization}), or use the function -@code{global-font-lock-mode} in your @file{.emacs} file, like this: + To toggle Font Lock mode in all buffers, type @kbd{M-x +global-font-lock-mode}. To impose this setting for future Emacs +sessions, customize the variable @code{global-font-lock-mode} +(@pxref{Easy Customization}), or add the following line to your init +file: @example (global-font-lock-mode 0) @end example -@noindent -This variable, like all the variables that control Font Lock mode, -take effect whenever fontification is done; that is, potentially at -any time. - @findex turn-on-font-lock - If you have disabled Global Font Lock mode, you can still enable Font +@noindent +If you have disabled Global Font Lock mode, you can still enable Font Lock for specific major modes by adding the function @code{turn-on-font-lock} to the mode hooks (@pxref{Hooks}). For -example, to enable Font Lock mode for editing C files, you can do this: +example, to enable Font Lock mode for editing C files, you can do +this: @example (add-hook 'c-mode-hook 'turn-on-font-lock) @@ -739,27 +722,19 @@ faces. @xref{Face Customization}. @vindex font-lock-maximum-decoration - The variable @code{font-lock-maximum-decoration} specifies the -preferred level of fontification, for modes that provide multiple -levels. Level 1 is the least amount of fontification; some modes -support levels as high as 3. The normal default is ``as high as -possible.'' You can specify an integer, which applies to all modes, or -you can specify different numbers for particular major modes; for -example, to use level 1 for C/C++ modes, and the default level -otherwise, use this: + You can customize the variable @code{font-lock-maximum-decoration} +to alter the amount of fontification applied by Font Lock mode, for +major modes that support this feature. The value should be a number +(with 1 representing a minimal amount of fontification; some modes +support levels as high as 3); or @code{t}, meaning ``as high as +possible'' (the default). You can also specify different numbers for +particular major modes; for example, to use level 1 for C/C++ modes, +and the default level otherwise, use the value @example -(setq font-lock-maximum-decoration - '((c-mode . 1) (c++-mode . 1))) +'((c-mode . 1) (c++-mode . 1))) @end example -@vindex font-lock-maximum-size - Fontification can be too slow for large buffers, so you can suppress -it for buffers above a certain size. The variable -@code{font-lock-maximum-size} specifies a buffer size, beyond which -buffer fontification is suppressed. - -@c @w is used below to prevent a bad page-break. @vindex font-lock-beginning-of-syntax-function @cindex incorrect fontification @cindex parenthesis in column zero and fontification @@ -768,11 +743,10 @@ relies on analysis of the syntactic structure of the buffer text. For the sake of speed, some modes, including Lisp mode, rely on a special convention: an open-parenthesis or open-brace in the leftmost column -always defines the @w{beginning} of a defun, and is thus always -outside any string or comment. (@xref{Left Margin Paren}.) If you -don't follow this convention, Font Lock mode can misfontify the text -that follows an open-parenthesis or open-brace in the leftmost column -that is inside a string or comment. +always defines the beginning of a defun, and is thus always outside +any string or comment. Therefore, you should avoid placing a an +open-parenthesis or open-brace in the leftmost column, if it is inside +a string or comment. @xref{Left Margin Paren}, for details. @cindex slow display during scrolling The variable @code{font-lock-beginning-of-syntax-function}, which is @@ -788,11 +762,11 @@ are close to the end of a large buffer. @findex font-lock-add-keywords - Font Lock highlighting patterns already exist for many modes, but you -may want to fontify additional patterns. You can use the function -@code{font-lock-add-keywords}, to add your own highlighting patterns for -a particular mode. For example, to highlight @samp{FIXME:} words in C -comments, use this: + Font Lock highlighting patterns already exist for most modes, but +you may want to fontify additional patterns. You can use the function +@code{font-lock-add-keywords}, to add your own highlighting patterns +for a particular mode. For example, to highlight @samp{FIXME:} words +in C comments, use this: @example (add-hook 'c-mode-hook @@ -803,19 +777,20 @@ @end example @findex font-lock-remove-keywords - To remove keywords from the font-lock highlighting patterns, use the +@noindent +To remove keywords from the font-lock highlighting patterns, use the function @code{font-lock-remove-keywords}. @xref{Search-based Fontification,,, elisp, The Emacs Lisp Reference Manual}. @cindex just-in-time (JIT) font-lock @cindex background syntax highlighting Fontifying large buffers can take a long time. To avoid large -delays when a file is visited, Emacs fontifies only the visible -portion of a buffer. As you scroll through the buffer, each portion -that becomes visible is fontified as soon as it is displayed; this -type of Font Lock is called @dfn{Just-In-Time} (or @dfn{JIT}) Lock. -You can control how JIT Lock behaves, including telling it to perform -fontification while idle, by customizing variables in the +delays when a file is visited, Emacs initially fontifies only the +visible portion of a buffer. As you scroll through the buffer, each +portion that becomes visible is fontified as soon as it is displayed; +this type of Font Lock is called @dfn{Just-In-Time} (or @dfn{JIT}) +Lock. You can control how JIT Lock behaves, including telling it to +perform fontification while idle, by customizing variables in the customization group @samp{jit-lock}. @xref{Specific Customization}. @node Highlight Interactively @@ -826,7 +801,7 @@ @findex highlight-changes-mode Highlight Changes mode is a minor mode that @dfn{highlights} the parts -of the buffer were changed most recently, by giving that text a +of the buffer that were changed most recently, by giving that text a different face. To enable or disable Highlight Changes mode, use @kbd{M-x highlight-changes-mode}. @@ -931,21 +906,23 @@ display symbols that provide information about the text in the window. The most common use of the fringes is to indicate a continuation -line, when one line of text is split into multiple lines on the -screen. The left fringe shows a curving arrow for each screen line -except the first, indicating that ``this is not the real beginning.'' -The right fringe shows a curving arrow for each screen line except the -last, indicating that ``this is not the real end.'' If the line's -direction is right-to-left (@pxref{Bidirectional Editing}), the -meaning of the curving arrows in the left and right fringes are +line (@pxref{Continuation Lines}). When one line of text is split +into multiple screen lines, the left fringe shows a curving arrow for +each screen line except the first, indicating that ``this is not the +real beginning.'' The right fringe shows a curving arrow for each +screen line except the last, indicating that ``this is not the real +end.'' If the line's direction is right-to-left (@pxref{Bidirectional +Editing}), the meanings of the curving arrows in the fringes are swapped. The fringes indicate line truncation with short horizontal arrows meaning ``there's more text on this line which is scrolled -horizontally out of view;'' clicking the mouse on one of the arrows -scrolls the display horizontally in the direction of the arrow. The -fringes can also indicate other things, such as empty lines, or where a -program you are debugging is executing (@pxref{Debuggers}). +horizontally out of view.'' Clicking the mouse on one of the arrows +scrolls the display horizontally in the direction of the arrow. + + The fringes can also indicate other things, such as buffer +boundaries (@pxref{Displaying Boundaries}), and where a program you +are debugging is executing (@pxref{Debuggers}). @findex set-fringe-style @findex fringe-mode @@ -958,10 +935,10 @@ @vindex indicate-buffer-boundaries On a graphical display, Emacs can indicate the buffer boundaries in -the fringes. It indicates the first line and the last line with -angle images in the fringes. This can be combined with up and down -arrow images which say whether it is possible to scroll the window up -and down. +the fringes. If you enable this feature, the first line and the last +line are marked with angle images in the fringes. This can be +combined with up and down arrow images which say whether it is +possible to scroll the window. The buffer-local variable @code{indicate-buffer-boundaries} controls how the buffer boundaries and window scrolling is indicated in the @@ -1006,25 +983,22 @@ present. @findex delete-trailing-whitespace - Type @kbd{M-x delete-trailing-whitespace @key{RET}} to delete all -trailing whitespace within the buffer's accessible portion -(@pxref{Narrowing}). This command does not remove newline characters. + Type @kbd{M-x delete-trailing-whitespace} to delete all trailing +whitespace within the buffer. If the region is active, it deletes all +trailing whitespace in the region instead. @vindex indicate-empty-lines @cindex unused lines @cindex fringes, and unused line indication - Emacs can indicate unused lines at the end of the window with a -small image in the left fringe (@pxref{Fringes}). The image appears -for window lines that do not correspond to any buffer text. Blank -lines at the end of the buffer then stand out because they do not have -this image in the fringe. - - To enable this feature, set the buffer-local variable -@code{indicate-empty-lines} to a non-@code{nil} value. You can enable -or disable this feature for all new buffers by setting the default -value of this variable, e.g.@: @code{(setq-default -indicate-empty-lines t)};. (This feature currently doesn't work on -text-only terminals.) + On graphical displays, Emacs can indicate unused lines at the end of +the window with a small image in the left fringe (@pxref{Fringes}). +The image appears for window lines that do not correspond to any +buffer text. Blank lines at the end of the buffer then stand out +because they do not have this image in the fringe. To enable this +feature, set the buffer-local variable @code{indicate-empty-lines} to +a non-@code{nil} value. You can enable or disable this feature for +all new buffers by setting the default value of this variable, +e.g.@:@code{(setq-default indicate-empty-lines t)}. @node Selective Display @section Selective Display @@ -1178,11 +1152,10 @@ @cindex mode line, 3D appearance @cindex attributes of mode line, changing @cindex non-integral number of lines in a window - By default, the mode line is drawn on graphics displays with -3D-style highlighting, like that of a button when it is not being -pressed. If you don't like this effect, you can disable the 3D -highlighting of the mode line, by customizing the attributes of the -@code{mode-line} face. @xref{Face Customization}. + On a graphical display, the mode line is drawn as a 3D box. If you +don't like this effect, you can disable it by customizing the +@code{mode-line} face and setting its @code{box} attribute to +@code{nil}. @xref{Face Customization}. @cindex non-selected windows, mode line appearance By default, the mode line of nonselected windows is displayed in a @@ -1210,51 +1183,45 @@ @node Text Display @section How Text Is Displayed @cindex characters (in text) +@cindex printing character - @acronym{ASCII} printing characters (octal codes 040 through 0176) in Emacs -buffers are displayed with their graphics, as are non-@acronym{ASCII} multibyte -printing characters (octal codes above 0400). + Most characters are @dfn{printing characters}: when they appear in a +buffer, they are displayed literally on the screen. Printing +characters include @acronym{ASCII} numbers, letters, and punctuation +characters, as well as many non-@acronym{ASCII} characters. @vindex tab-width - Some @acronym{ASCII} control characters are displayed in special -ways. The newline character (octal code 012) is displayed by starting -a new line. The tab character (octal code 011) is displayed by moving -to the next tab stop column (normally every 8 columns). The number of -spaces per tab is controlled by the variable @code{tab-width}, which -must have an integer value between 1 and 1000, inclusive, and is made -buffer-local by changing it. Note that how the tab character in the buffer -is displayed has nothing to do with the definition of @key{TAB} as a -command. - - Other @acronym{ASCII} control characters are normally displayed as a caret -(@samp{^}) followed by the non-control version of the character; thus, -control-A is displayed as @samp{^A}. The caret appears in face -@code{escape-glyph}. - - Non-@acronym{ASCII} characters 0200 through 0237 (octal) are -displayed with octal escape sequences; thus, character code 0230 -(octal) is displayed as @samp{\230}. The backslash appears in face -@code{escape-glyph}. +@cindex control character + The @acronym{ASCII} character set contains non-printing @dfn{control +characters}. Two of these are displayed specially: the newline +character (Unicode code point @code{U+000A}) is displayed by starting +a new line, while the tab character (@code{U+0009}) is displayed as a +space that extends to the next tab stop column (normally every 8 +columns). The number of spaces per tab is controlled by the +buffer-local variable @code{tab-width}, which must have an integer +value between 1 and 1000, inclusive. Note that how the tab character +in the buffer is displayed has nothing to do with the definition of +@key{TAB} as a command. + + Other @acronym{ASCII} control characters are displayed as a caret +(@samp{^}) followed by the non-control version of the character, with +the @code{escape-glyph} face. For instance, the @samp{control-A} +character, @code{U+0001}, is displayed as @samp{^A}. @vindex ctl-arrow - If the variable @code{ctl-arrow} is @code{nil}, control characters in -the buffer are displayed with octal escape sequences, except for newline -and tab. Altering the value of @code{ctl-arrow} makes it local to the -current buffer; until that time, the default value is in effect. The -default is initially @code{t}. - - The display of character codes 0240 through 0377 (octal) may be -either as escape sequences or as graphics. They do not normally occur -in multibyte buffers, but if they do, they are displayed as Latin-1 -graphics. In unibyte mode, if you enable European display they are -displayed using their graphics (assuming your terminal supports them), -otherwise as escape sequences. @xref{Unibyte Mode}. + The non-@acronym{ASCII}, non-printing characters @code{U+0080} +(octal 200) through @code{U+009F} (octal 237) are displayed as octal +escape sequences, with the @code{escape-glyph} face. For instance, +character code @code{U+0098} (octal 230) is displayed as @samp{\230}. +If you change the buffer-local variable @code{ctl-arrow} to +@code{nil}, @acronym{ASCII} control characters are also displayed as +octal escape sequences instead of caret escape sequences. @vindex nobreak-char-display -@cindex no-break space, display -@cindex no-break hyphen, display +@cindex non-breaking space, display +@cindex non-breaking hyphen, display @cindex soft hyphen, display - Some character sets define ``no-break'' versions of the space and + There are two special ``non-breaking'' versions of the space and hyphen characters, which are used where a line should not be broken. Emacs normally displays these characters with special faces (respectively, @code{nobreak-space} and @code{escape-glyph}) to @@ -1269,45 +1236,13 @@ @cindex glyphless characters @cindex characters with no font glyphs - On graphics displays, some characters could have no glyphs in any of -the fonts available to Emacs. On text terminals, some characters -could be impossible to encode with the terminal coding system -(@pxref{Terminal Coding}). Emacs can display such @dfn{glyphless} -characters using one of the following methods: - -@table @code -@item zero-width -Don't display the character. - -@item thin-space -Display a thin space, 1-pixel wide on graphics displays or 1-character -wide on text terminals. - -@item empty-box -Display an empty box. - -@item acronym -Display the acronym of the character's name (such as @sc{zwnj} or -@sc{rlm}) in a box. - -@item hex-code -Display the Unicode codepoint of the character in hexadecimal -notation, in a box. -@end table - -@noindent -@cindex @code{glyphless-char} face -With the exception of @code{zero-width}, all other methods draw these -characters in a special face @code{glyphless-char}, which you can -customize. - -@vindex glyphless-char-display-control -@vindex char-acronym-table -To control what glyphless characters are displayed using which method, -customize the variable @code{glyphless-char-display-control}; see its -doc string for the details. For even finer control, set the elements -of 2 char-tables: @code{glyphless-char-display} and -@code{char-acronym-table}. + On graphical displays, some characters may have no glyphs in any of +the fonts available to Emacs. These @dfn{glyphless characters} are +normally displayed as boxes containing the hexadecimal character code. +You can control the display method by customizing the variable +@code{glyphless-char-display-control}. @xref{Glyphless Chars,, +Glyphless Character Display, elisp, The Emacs Lisp Reference Manual}, +for details. @node Cursor Display @section Displaying the Cursor === modified file 'doc/emacs/emacs.texi' --- doc/emacs/emacs.texi 2011-10-13 16:03:49 +0000 +++ doc/emacs/emacs.texi 2011-10-18 01:42:28 +0000 @@ -350,7 +350,7 @@ * Follow Mode:: Follow mode lets two windows scroll as one. * Faces:: How to change the display style using faces. * Standard Faces:: Emacs' predefined faces. -* Temporary Face Changes:: Commands to temporarily modify the default text face +* Text Scale:: Increasing or decreasing text size in a buffer. * Font Lock:: Minor mode for syntactic highlighting using faces. * Highlight Interactively:: Tell Emacs what text to highlight. * Fringes:: Enabling or disabling window fringes. === modified file 'doc/emacs/frames.texi' --- doc/emacs/frames.texi 2011-10-13 16:03:49 +0000 +++ doc/emacs/frames.texi 2011-10-18 01:42:28 +0000 @@ -299,7 +299,7 @@ @item S-Mouse-1 This menu is for changing the default face within the window's buffer. -@xref{Temporary Face Changes}. +@xref{Text Scale}. @end table @node Mode Line Mouse @@ -1185,6 +1185,13 @@ @key{RET} tooltip @key{RET}}. @xref{X Resources}, for information on customizing the windows that display tooltips. +@vindex x-gtk-use-system-tooltips + If Emacs is built with GTK support, it displays tooltips via GTK, +using the default appearance of GTK tooltips. To disable this, change +the variable @code{x-gtk-use-system-tooltips} to @code{nil}. If you +do this, or if Emacs is built without GTK support, the @code{tooltip} +face specifies most attributes of the tooltip text. + @node Mouse Avoidance @section Mouse Avoidance @cindex avoiding mouse in the way of your typing === modified file 'doc/emacs/macos.texi' --- doc/emacs/macos.texi 2011-05-17 02:26:56 +0000 +++ doc/emacs/macos.texi 2011-10-18 01:42:28 +0000 @@ -54,12 +54,12 @@ instead). To discard the settings, create a new frame and close the altered one. - @key{S-Mouse-1} (i.e., clicking the left mouse button -while holding down the @key{Shift} key) adjusts the region to the -click position, just like @key{Mouse-3} (@code{mouse-save-then-kill}); -it does not pop up a menu for changing the default face, as -@key{S-Mouse-1} normally does (@pxref{Temporary Face Changes}). This -change makes Emacs behave more like other Mac / GNUstep applications. + @key{S-Mouse-1} (i.e., clicking the left mouse button while holding +down the @key{Shift} key) adjusts the region to the click position, +just like @key{Mouse-3} (@code{mouse-save-then-kill}); it does not pop +up a menu for changing the default face, as @key{S-Mouse-1} normally +does (@pxref{Text Scale}). This change makes Emacs behave more like +other Mac / GNUstep applications. When you open or save files using the menus, or using the @key{Cmd-o} and @key{Cmd-S} bindings, Emacs uses graphical file === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2011-10-13 16:03:49 +0000 +++ doc/lispref/ChangeLog 2011-10-18 01:42:28 +0000 @@ -1,3 +1,7 @@ +2011-10-18 Chong Yidong + + * display.texi (Glyphless Chars): New node. + 2011-10-13 Chong Yidong * text.texi (Yanking): Document yank-excluded-properties. === modified file 'doc/lispref/display.texi' --- doc/lispref/display.texi 2011-10-05 21:39:54 +0000 +++ doc/lispref/display.texi 2011-10-18 01:42:28 +0000 @@ -36,6 +36,7 @@ * Window Systems:: Which window system is being used. * Bidirectional Display:: Display of bidirectional scripts, such as Arabic and Farsi. +* Glyphless Chars:: How glyphless characters are drawn. @end menu @node Refresh Screen @@ -6242,3 +6243,96 @@ appropriate mirrored character in the reordered text. Lisp programs can affect the mirrored display by changing this property. Again, any such changes affect all of Emacs display. + +@node Glyphless Chars +@section Glyphless Character Display +@cindex glyphless characters + + @dfn{Glyphless characters} are not displayed in the usual way when +they appear in a buffer, but in some special way (e.g. as a box +containing a hexadecimal code). These include characters that cannot +be displayed with any available font (on a graphical display), or that +cannot be encoded by the terminal's coding system (on a text-only +terminal). Specific characters can also be defined to be glyphless. + +@defvar glyphless-char-display +The value of this variable is a char-table that defines glyphless +characters and how they are displayed. If an entry is @code{nil}, the +corresponding character is displayed in its usual way. Otherwise, an +entry should be one of the following display methods: + +@table @asis +@item @code{zero-width} +Don't display the character. + +@item @code{thin-space} +Display a thin space, 1-pixel wide on graphical displays, or +1-character wide on text-only terminals. + +@item @code{empty-box} +Display an empty box. + +@item @code{hex-code} +Display a box containing the Unicode codepoint of the character, in +hexadecimal notation. + +@item an @acronym{ASCII} string +Display a box containing that string. +@end table + +@noindent +Except for @code{zero-width}, these methods display using the +@code{glyphless-char} face. + +An entry can also be a cons cell @code{(@var{graphical} +. @var{text})}, where @var{graphical} and @var{text} are the display +methods on graphical displays and text-only terminals respectively. + +The char-table has one extra slot, which determines how to display any +character that cannot be displayed with any available font, or cannot +be encoded by the terminal's coding system. Its value should be one +of the above display methods, except @code{zero-width} or a cons cell. +@end defvar + +@defopt glyphless-char-display-control +This user option provides a convenient way to set +@code{glyphless-char-display} for groups of similar characters. It +takes effect via a custom @code{:set} function (@pxref{Variable +Definitions}), which update @code{glyphless-char-display}. + +Its value should be an alist of elements @code{(@var{group} +. @var{method})}, where @var{group} is a symbol specifying a group of +characters, and @var{method} is a symbol specifying how to display +them. + +@var{group} should be one of the following: + +@table @code +@item c0-control +@acronym{ASCII} control characters @code{U+0000} to @code{U+001F}, +excluding the newline and tab characters (normally displayed as escape +sequences like @samp{^A}; @pxref{Text Display,, How Text Is Displayed, +emacs, The GNU Emacs Manual}). + +@item c1-control +Non-@acronym{ASCII}, non-printing characters @code{U+0080} to +@code{U+009F} (normally displayed as octal escape sequences like +@samp{\230}). + +@item format-control +Characters of Unicode General Category `Cf', such as @samp{U+200E} +(Left-to-Right Mark), but excluding characters that have graphic +images, such as @samp{U+00AD} (Soft Hyphen). + +@item no-font +Characters for there is no suitable font, or which cannot be encoded +by the terminal's coding system. +@end table + +@c FIXME: this can also be `acronym', but that's not currently +@c completely implemented; it applies only to the format-control +@c group, and only works if the acronym is in `char-acronym-table'. +The @var{method} symbol should be one of @code{zero-width}, +@code{thin-space}, @code{empty-box}, or @code{hex-code}. These have +the same meanings as in @code{glyphless-char-display}, above. +@end defopt === modified file 'doc/lispref/elisp.texi' --- doc/lispref/elisp.texi 2011-09-25 15:08:25 +0000 +++ doc/lispref/elisp.texi 2011-10-18 01:42:28 +0000 @@ -1278,6 +1278,9 @@ * Display Tables:: How to specify other conventions. * Beeping:: Audible signal to the user. * Window Systems:: Which window system is being used. +* Bidirectional Display:: Display of bidirectional scripts, such as + Arabic and Farsi. +* Glyphless Chars:: How glyphless characters are drawn. The Echo Area === modified file 'doc/lispref/vol1.texi' --- doc/lispref/vol1.texi 2011-09-25 03:32:51 +0000 +++ doc/lispref/vol1.texi 2011-10-18 01:42:28 +0000 @@ -1299,6 +1299,9 @@ * Display Tables:: How to specify other conventions. * Beeping:: Audible signal to the user. * Window Systems:: Which window system is being used. +* Bidirectional Display:: Display of bidirectional scripts, such as + Arabic and Farsi. +* Glyphless Chars:: How glyphless characters are drawn. The Echo Area === modified file 'doc/lispref/vol2.texi' --- doc/lispref/vol2.texi 2011-09-25 03:32:51 +0000 +++ doc/lispref/vol2.texi 2011-10-18 01:42:28 +0000 @@ -1298,6 +1298,9 @@ * Display Tables:: How to specify other conventions. * Beeping:: Audible signal to the user. * Window Systems:: Which window system is being used. +* Bidirectional Display:: Display of bidirectional scripts, such as + Arabic and Farsi. +* Glyphless Chars:: How glyphless characters are drawn. The Echo Area === modified file 'etc/NEWS' --- etc/NEWS 2011-10-17 22:21:48 +0000 +++ etc/NEWS 2011-10-18 01:42:28 +0000 @@ -236,10 +236,10 @@ The frame-parameter tool-bar-position controls this. It takes the values top, left, right or bottom. The Options => Show/Hide menu has entries for this. - ++++ *** The colors for selected text (the `region' face) are taken from the GTK theme when Emacs is built with GTK. - ++++ *** Emacs uses GTK tooltips by default if built with GTK. You can turn that off by customizing x-gtk-use-system-tooltips. @@ -1146,6 +1146,7 @@ *** New variable `completing-read-function' allows overriding the behavior of `completing-read'. ++++ ** `glyphless-char-display' can now distinguish between graphical and text terminal display, via a char-table entry that is a cons cell. @@ -1311,7 +1312,7 @@ *** `byte-compile-disable-print-circle' is obsolete. *** `deferred-action-list' and `deferred-action-function' are obsolete. - ++++ *** `font-lock-maximum-size' is obsolete. ------------------------------------------------------------ revno: 106109 author: Teodor Zlatanov committer: Katsumi Yamaoka branch nick: trunk timestamp: Mon 2011-10-17 22:51:37 +0000 message: Merge changes made in Gnus trunk. From Dave Abrahams . gnus-registry.el (gnus-registry-enabled): Add new variable. (gnus-registry-install-shortcuts): Set `gnus-registry-install' to 'ask only while we need to find out if it should be t or nil. (gnus-registry-initialize): Don't set `gnus-registry-install' to t. (gnus-registry-install-hooks): Set `gnus-registry-enabled' to t when the registry is installed. Set it to nil when it's unloaded. (gnus-registry-install-p): Provide user guidance for the initial value of `gnus-registry-install' when it's 'ask, otherwise return its value. nnregistry.el (nnregistry-open-server, nnregistry-server-opened): Use `gnus-registry-enabled' instead of `gnus-registry-install'. nnmairix.el (nnmairix-determine-original-group-from-registry): Use `gnus-registry-enabled' instead of `gnus-registry-install'. nnir.el (nnir-mode): Use `gnus-registry-enabled' instead of `gnus-registry-install'. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2011-10-17 04:29:19 +0000 +++ lisp/gnus/ChangeLog 2011-10-17 22:51:37 +0000 @@ -1,3 +1,21 @@ +2011-10-17 Teodor Zlatanov + + * gnus-registry.el (gnus-registry-enabled): Add new variable. + (gnus-registry-install-shortcuts): Set `gnus-registry-install' to 'ask + only while we need to find out if it should be t or nil. + (gnus-registry-initialize): Don't set `gnus-registry-install' to t. + (gnus-registry-install-hooks): Set `gnus-registry-enabled' to t when + the registry is installed. Set it to nil when it's unloaded. + (gnus-registry-install-p): Provide user guidance for the initial value + of `gnus-registry-install' when it's 'ask, otherwise return its value. + * nnregistry.el (nnregistry-open-server, nnregistry-server-opened): + Use `gnus-registry-enabled' instead of `gnus-registry-install'. + * nnmairix.el (nnmairix-determine-original-group-from-registry): + Use `gnus-registry-enabled' instead of `gnus-registry-install'. + * nnir.el (nnir-mode): Use `gnus-registry-enabled' instead of + `gnus-registry-install'. + From Dave Abrahams . + 2011-10-17 Daiki Ueno * mml2015.el (mml2015-epg-find-usable-key): Skip the whole key if the === modified file 'lisp/gnus/gnus-registry.el' --- lisp/gnus/gnus-registry.el 2011-06-26 22:21:48 +0000 +++ lisp/gnus/gnus-registry.el 2011-10-17 22:51:37 +0000 @@ -164,6 +164,8 @@ (const :tag "Always Install" t) (const :tag "Ask Me" ask))) +(defvar gnus-registry-enabled) + (defvar gnus-summary-misc-menu) ;; Avoid byte compiler warning. (defvar gnus-registry-misc-menus nil) ; ugly way to keep the menus @@ -873,8 +875,9 @@ ;; if this is called and the user doesn't want the ;; registry enabled, we'll ask anyhow - (when (eq gnus-registry-install nil) - (setq gnus-registry-install 'ask)) + (unless gnus-registry-install + (let ((gnus-registry-install 'ask)) + (gnus-registry-install-p))) ;; now the user is asked if gnus-registry-install is 'ask (when (gnus-registry-install-p) @@ -1151,7 +1154,6 @@ "Initialize the Gnus registry." (interactive) (gnus-message 5 "Initializing the registry") - (setq gnus-registry-install t) ; in case it was 'ask or nil (gnus-registry-install-hooks) (gnus-registry-install-shortcuts) (gnus-registry-read)) @@ -1160,6 +1162,7 @@ (defun gnus-registry-install-hooks () "Install the registry hooks." (interactive) + (setq gnus-registry-enabled t) (add-hook 'gnus-summary-article-move-hook 'gnus-registry-action) (add-hook 'gnus-summary-article-delete-hook 'gnus-registry-action) (add-hook 'gnus-summary-article-expire-hook 'gnus-registry-action) @@ -1181,23 +1184,25 @@ (remove-hook 'gnus-save-newsrc-hook 'gnus-registry-save) (remove-hook 'gnus-read-newsrc-el-hook 'gnus-registry-read) - (remove-hook 'gnus-summary-prepare-hook 'gnus-registry-register-message-ids)) + (remove-hook 'gnus-summary-prepare-hook 'gnus-registry-register-message-ids) + (setq gnus-registry-enabled nil)) (add-hook 'gnus-registry-unload-hook 'gnus-registry-unload-hook) (defun gnus-registry-install-p () + "If the registry is not already enabled, and `gnus-registry-install' is t, +the registry is enabled. If `gnus-registry-install' is `ask', +the user is asked first. Returns non-nil iff the registry is enabled." (interactive) - (when (eq gnus-registry-install 'ask) - (setq gnus-registry-install - (gnus-y-or-n-p - (concat "Enable the Gnus registry? " - "See the variable `gnus-registry-install' " - "to get rid of this query permanently. "))) - (when gnus-registry-install - ;; we just set gnus-registry-install to t, so initialize the registry! + (unless gnus-registry-enabled + (when (if (eq gnus-registry-install 'ask) + (gnus-y-or-n-p + (concat "Enable the Gnus registry? " + "See the variable `gnus-registry-install' " + "to get rid of this query permanently. ")) + gnus-registry-install) (gnus-registry-initialize))) -;;; we could call it here: (customize-variable 'gnus-registry-install) - gnus-registry-install) + gnus-registry-enabled) ;; TODO: a few things === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2011-09-05 22:07:34 +0000 +++ lisp/gnus/nnir.el 2011-10-17 22:51:37 +0000 @@ -290,8 +290,7 @@ (autoload 'nnimap-command "nnimap") (autoload 'nnimap-possibly-change-group "nnimap") (autoload 'nnimap-make-thread-query "nnimap") - (autoload 'gnus-registry-action "gnus-registry") - (defvar gnus-registry-install)) + (autoload 'gnus-registry-action "gnus-registry")) (nnoo-declare nnir) @@ -1741,8 +1740,7 @@ (when (eq (car (gnus-find-method-for-group gnus-newsgroup-name)) 'nnir) (setq gnus-summary-line-format (or nnir-summary-line-format gnus-summary-line-format)) - (when (and (boundp 'gnus-registry-install) - (eq gnus-registry-install t)) + (when (bound-and-true-p gnus-registry-enabled) (remove-hook 'gnus-summary-article-delete-hook 'gnus-registry-action t) (remove-hook 'gnus-summary-article-move-hook 'gnus-registry-action t) (remove-hook 'gnus-summary-article-expire-hook 'gnus-registry-action t) === modified file 'lisp/gnus/nnmairix.el' --- lisp/gnus/nnmairix.el 2011-08-18 22:12:47 +0000 +++ lisp/gnus/nnmairix.el 2011-10-17 22:51:37 +0000 @@ -603,7 +603,6 @@ nil)) ;; Silence byte-compiler. -(defvar gnus-registry-install) (autoload 'gnus-registry-get-id-key "gnus-registry") (deffoo nnmairix-request-set-mark (group actions &optional server) @@ -1636,8 +1635,7 @@ (defun nnmairix-determine-original-group-from-registry (mid) "Try to determinale original group for message-id MID from the registry." - (when (and (boundp 'gnus-registry-install) - gnus-registry-install) + (when (bound-and-true-p gnus-registry-enabled) (unless (string-match "^<" mid) (set mid (concat "<" mid))) (unless (string-match ">$" mid) === modified file 'lisp/gnus/nnregistry.el' --- lisp/gnus/nnregistry.el 2011-04-05 22:35:05 +0000 +++ lisp/gnus/nnregistry.el 2011-10-17 22:51:37 +0000 @@ -36,8 +36,11 @@ (nnoo-declare nnregistry) +;; Suppress byte-compiler warning `reference to free variable' +(defvar gnus-registry-enabled) + (deffoo nnregistry-server-opened (server) - (eq gnus-registry-install t)) + gnus-registry-enabled) (deffoo nnregistry-close-server (server) t) @@ -46,7 +49,7 @@ nil) (deffoo nnregistry-open-server (server &optional defs) - (eq gnus-registry-install t)) + gnus-registry-enabled) (defvar nnregistry-within-nnregistry nil) ------------------------------------------------------------ revno: 106108 committer: Chong Yidong branch nick: trunk timestamp: Mon 2011-10-17 18:21:48 -0400 message: * lisp/font-lock.el (font-lock-maximum-size): Mark as obsolete. diff: === modified file 'etc/NEWS' --- etc/NEWS 2011-10-15 16:37:45 +0000 +++ etc/NEWS 2011-10-17 22:21:48 +0000 @@ -237,8 +237,8 @@ top, left, right or bottom. The Options => Show/Hide menu has entries for this. -*** The colors for selected text (the region face) are taken from the GTK -theme when Emacs is built with GTK. +*** The colors for selected text (the `region' face) are taken from +the GTK theme when Emacs is built with GTK. *** Emacs uses GTK tooltips by default if built with GTK. You can turn that off by customizing x-gtk-use-system-tooltips. @@ -1312,6 +1312,8 @@ *** `deferred-action-list' and `deferred-action-function' are obsolete. +*** `font-lock-maximum-size' is obsolete. + * Changes in Emacs 24.1 on non-free operating systems === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-17 19:48:28 +0000 +++ lisp/ChangeLog 2011-10-17 22:21:48 +0000 @@ -1,3 +1,7 @@ +2011-10-17 Chong Yidong + + * font-lock.el (font-lock-maximum-size): Mark as obsolete. + 2011-10-17 Ryan Barrett (tiny change) * dirtrack.el (dirtrack): Support shell buffers with path === modified file 'lisp/font-lock.el' --- lisp/font-lock.el 2011-08-21 03:02:39 +0000 +++ lisp/font-lock.el 2011-10-17 22:21:48 +0000 @@ -228,8 +228,11 @@ ;; User variables. (defcustom font-lock-maximum-size 256000 - "Maximum size of a buffer for buffer fontification. -Only buffers less than this can be fontified when Font Lock mode is turned on. + "Maximum buffer size for unsupported buffer fontification. +When `font-lock-support-mode' is nil, only buffers smaller than +this are fontified. This variable has no effect if a Font Lock +support mode (usually `jit-lock-mode') is enabled. + If nil, means size is irrelevant. If a list, each element should be a cons pair of the form (MAJOR-MODE . SIZE), where MAJOR-MODE is a symbol or t (meaning the default). For example: @@ -248,6 +251,7 @@ (const :tag "none" nil) (integer :tag "size"))))) :group 'font-lock) +(make-obsolete-variable 'font-lock-maximum-size nil "24.1") (defcustom font-lock-maximum-decoration t "Maximum decoration level for fontification. ------------------------------------------------------------ revno: 106107 author: Ryan Barrett committer: Michael Albinus branch nick: trunk timestamp: Mon 2011-10-17 21:48:28 +0200 message: * dirtrack.el (dirtrack): Support shell buffers with path prefixes, e.g. tramp-based remote shells. (Bug#9647) diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-17 17:40:27 +0000 +++ lisp/ChangeLog 2011-10-17 19:48:28 +0000 @@ -1,3 +1,8 @@ +2011-10-17 Ryan Barrett (tiny change) + + * dirtrack.el (dirtrack): Support shell buffers with path + prefixes, e.g. tramp-based remote shells. (Bug#9647) + 2011-10-17 Teodor Zlatanov * json.el: Bump version to 1.3 and note change in History. === modified file 'lisp/dirtrack.el' --- lisp/dirtrack.el 2011-04-19 13:44:55 +0000 +++ lisp/dirtrack.el 2011-10-17 19:48:28 +0000 @@ -227,7 +227,7 @@ function `dirtrack-debug-mode' to turn on debugging output." (unless (or (null dirtrack-mode) (eq (point) (point-min))) ; no output? - (let (prompt-path + (let (prompt-path orig-prompt-path (current-dir default-directory) (dirtrack-regexp (nth 0 dirtrack-list)) (match-num (nth 1 dirtrack-list))) @@ -243,8 +243,9 @@ (if (not (> (length prompt-path) 0)) (dirtrack-debug-message "Match is empty string") ;; Transform prompts into canonical forms - (setq prompt-path (funcall dirtrack-directory-function - prompt-path) + (setq orig-prompt-path (funcall dirtrack-directory-function + prompt-path) + prompt-path (shell-prefixed-directory-name orig-prompt-path) current-dir (funcall dirtrack-canonicalize-function current-dir)) (dirtrack-debug-message @@ -257,8 +258,9 @@ ;; It's possible that Emacs will think the directory ;; won't exist (eg, rlogin buffers) (if (file-accessible-directory-p prompt-path) - ;; Change directory - (and (shell-process-cd prompt-path) + ;; Change directory. shell-process-cd adds the prefix, so we + ;; need to give it the original (un-prefixed) path. + (and (shell-process-cd orig-prompt-path) (run-hooks 'dirtrack-directory-change-hook) (dirtrack-debug-message (format "Changing directory to %s" prompt-path))) ------------------------------------------------------------ revno: 106106 fixes bug(s): http://debbugs.gnu.org/9771 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2011-10-17 21:13:44 +0200 message: Fix part 1 of bug #9771 with assertion violation in move_it_by_lines. src/xdisp.c (move_it_vertically_backward): Don't look for character position immediately after the newline when in a continuation line. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-17 17:03:20 +0000 +++ src/ChangeLog 2011-10-17 19:13:44 +0000 @@ -3,6 +3,9 @@ * xdisp.c (push_display_prop): Determine whether to record string or buffer position by IT->string, not by IT->method. Allow GET_FROM_DISPLAY_VECTOR as IT->method on entry. (Bug#9771, part 4) + (move_it_vertically_backward): Don't look for character position + immediately after the newline when in a continuation line. + (Bug#9771, part 1) 2011-10-15 Martin Rudalics === modified file 'src/xdisp.c' --- src/xdisp.c 2011-10-17 17:03:20 +0000 +++ src/xdisp.c 2011-10-17 19:13:44 +0000 @@ -8768,7 +8768,10 @@ reordering. We want to get to the character position that is immediately after the newline of the previous line. */ - if (it->bidi_p && IT_CHARPOS (*it) > BEGV + if (it->bidi_p + && !it->continuation_lines_width + && !STRINGP (it->string) + && IT_CHARPOS (*it) > BEGV && FETCH_BYTE (IT_BYTEPOS (*it) - 1) != '\n') { EMACS_INT nl_pos = ------------------------------------------------------------ revno: 106105 committer: Ted Zlatanov branch nick: quickfixes timestamp: Mon 2011-10-17 13:40:27 -0400 message: * json.el: Bump version to 1.3; (json-alist-p, json-plist-p): Rewrite to avoid recursion. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-17 16:33:23 +0000 +++ lisp/ChangeLog 2011-10-17 17:40:27 +0000 @@ -1,3 +1,8 @@ +2011-10-17 Teodor Zlatanov + + * json.el: Bump version to 1.3 and note change in History. + (json-alist-p, json-plist-p): Rewrite to avoid recursion. + 2011-10-17 Stefan Monnier * comint.el (comint-insert-input, comint-send-input) === modified file 'lisp/json.el' --- lisp/json.el 2011-01-25 04:08:28 +0000 +++ lisp/json.el 2011-10-17 17:40:27 +0000 @@ -3,7 +3,7 @@ ;; Copyright (C) 2006-2011 Free Software Foundation, Inc. ;; Author: Edward O'Connor -;; Version: 1.2 +;; Version: 1.3 ;; Keywords: convenience ;; This file is part of GNU Emacs. @@ -47,6 +47,7 @@ ;; other cleanups, bugfixes, and improvements. ;; 2006-12-29 - XEmacs support, from Aidan Kehoe . ;; 2008-02-21 - Installed in GNU Emacs. +;; 2011-10-17 - Patch `json-alist-p' and `json-plist-p' to avoid recursion -tzz ;;; Code: @@ -108,16 +109,20 @@ (defun json-alist-p (list) "Non-null if and only if LIST is an alist." - (or (null list) - (and (consp (car list)) - (json-alist-p (cdr list))))) + (while (consp list) + (setq list (if (consp (car list)) + (cdr list) + 'not-alist))) + (null list)) (defun json-plist-p (list) "Non-null if and only if LIST is a plist." - (or (null list) - (and (keywordp (car list)) - (consp (cdr list)) - (json-plist-p (cddr list))))) + (while (consp list) + (setq list (if (and (keywordp (car list)) + (consp (cdr list))) + (cddr list) + 'not-plist))) + (null list)) ;; Reader utilities ------------------------------------------------------------ revno: 106104 committer: Glenn Morris branch nick: trunk timestamp: Mon 2011-10-17 13:28:17 -0400 message: ChangeLog fix (problem had no particular relation to CentOS). diff: === modified file 'ChangeLog' --- ChangeLog 2011-10-13 02:16:59 +0000 +++ ChangeLog 2011-10-17 17:28:17 +0000 @@ -5,7 +5,7 @@ 2011-10-12 Paul Eggert * configure.in: Remove check for -lintl (Bug#9713). - The check breaks 'configure' in some CentOS 5.7 x86 configurations. + The check could break 'configure' on GNU/Linux with a (broken) libintl. The check was helpful but not essential in Solaris 2.6 (1997), and is no longer needed in Solaris 8 (2000). Solaris 2.6 is obsolete -- Sun dropped support for it in 2006 -- and without ------------------------------------------------------------ revno: 106103 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2011-10-17 13:14:04 -0400 message: * lisp/comint.el (comint-insert-input): Fix last change. diff: === modified file 'lisp/comint.el' --- lisp/comint.el 2011-10-17 16:33:23 +0000 +++ lisp/comint.el 2011-10-17 17:14:04 +0000 @@ -847,9 +847,10 @@ ;; If pos is at the very end of a field, the mouse-click was ;; probably outside (to the right) of the field. (and (< pos (field-end pos)) - (setq field (field-at-pos pos)) - (setq input (field-string-no-properties pos)))) - (if (or (null comint-accum-marker) field) + (< (field-end pos) (point-max)) + (progn (setq field (field-at-pos pos)) + (setq input (field-string-no-properties pos))))) + (if (or (null input) (null comint-accum-marker) field) ;; Fall back to the global definition if (i) the selected ;; buffer is not a comint buffer (which can happen if a ;; non-comint window was selected and we clicked in a comint ------------------------------------------------------------ revno: 106102 fixes bug(s): http://debbugs.gnu.org/9771 committer: Eli Zaretskii branch nick: trunk timestamp: Mon 2011-10-17 19:03:20 +0200 message: Fix part 4 of bug#9771 with assertion violation when wrap-prefix is used for a line that begins with control characters. src/xdisp.c (push_display_prop): Determine whether to record string or buffer position by IT->string, not by IT->method. Allow GET_FROM_DISPLAY_VECTOR as IT->method on entry. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2011-10-15 10:12:00 +0000 +++ src/ChangeLog 2011-10-17 17:03:20 +0000 @@ -1,3 +1,9 @@ +2011-10-17 Eli Zaretskii + + * xdisp.c (push_display_prop): Determine whether to record string + or buffer position by IT->string, not by IT->method. Allow + GET_FROM_DISPLAY_VECTOR as IT->method on entry. (Bug#9771, part 4) + 2011-10-15 Martin Rudalics * window.c (coordinates_in_window): Rewrite and delabelize === modified file 'src/xdisp.c' --- src/xdisp.c 2011-10-13 11:17:32 +0000 +++ src/xdisp.c 2011-10-17 17:03:20 +0000 @@ -18427,9 +18427,10 @@ push_display_prop (struct it *it, Lisp_Object prop) { struct text_pos pos = - (it->method == GET_FROM_STRING) ? it->current.string_pos : it->current.pos; + STRINGP (it->string) ? it->current.string_pos : it->current.pos; xassert (it->method == GET_FROM_BUFFER + || it->method == GET_FROM_DISPLAY_VECTOR || it->method == GET_FROM_STRING); /* We need to save the current buffer/string position, so it will be ------------------------------------------------------------ revno: 106101 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9160 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2011-10-17 12:33:23 -0400 message: comint.el: Don't let `insert' break an `input' field into two. * lisp/comint.el (comint-insert-input, comint-send-input) (comint-get-old-input-default, comint-backward-matching-input) (comint-next-prompt): Use nil instead of `input' for field property of past user input (bug#114). diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-17 16:30:02 +0000 +++ lisp/ChangeLog 2011-10-17 16:33:23 +0000 @@ -1,5 +1,10 @@ 2011-10-17 Stefan Monnier + * comint.el (comint-insert-input, comint-send-input) + (comint-get-old-input-default, comint-backward-matching-input) + (comint-next-prompt): Use nil instead of `input' for field property of + past user input (bug#114). + * minibuffer.el (completion--replace): Inherit surrounding properties (bug#114). (minibuffer-complete-and-exit): Use it. === modified file 'lisp/comint.el' --- lisp/comint.el 2011-10-17 13:43:40 +0000 +++ lisp/comint.el 2011-10-17 16:33:23 +0000 @@ -849,8 +849,7 @@ (and (< pos (field-end pos)) (setq field (field-at-pos pos)) (setq input (field-string-no-properties pos)))) - (if (or (null comint-accum-marker) - (not (eq field 'input))) + (if (or (null comint-accum-marker) field) ;; Fall back to the global definition if (i) the selected ;; buffer is not a comint buffer (which can happen if a ;; non-comint window was selected and we clicked in a comint @@ -1803,8 +1802,7 @@ (add-text-properties beg end '(mouse-face highlight - help-echo "mouse-2: insert after prompt as new input" - field input)))) + help-echo "mouse-2: insert after prompt as new input")))) (unless (or no-newline comint-use-prompt-regexp) ;; Cover the terminating newline (add-text-properties end (1+ end) @@ -2153,7 +2151,7 @@ the current line with any initial string matching the regexp `comint-prompt-regexp' removed." (let ((bof (field-beginning))) - (if (eq (get-char-property bof 'field) 'input) + (if (null (get-char-property bof 'field)) ;Not `output'. (field-string-no-properties bof) (comint-bol) (buffer-substring-no-properties (point) (line-end-position))))) @@ -2473,7 +2471,7 @@ (while (/= n 0) (unless (re-search-backward regexp nil t dir) (error "Not found")) - (when (eq (get-char-property (point) 'field) 'input) + (unless (get-char-property (point) 'field) (setq n (- n dir)))) (field-beginning)))) (goto-char pos)))) @@ -2520,7 +2518,7 @@ (setq input-pos (point-max))) ;; stop iterating (setq n 0)) - ((eq (get-char-property pos 'field) 'input) + ((null (get-char-property pos 'field)) (setq n (if (< n 0) (1+ n) (1- n))) (setq input-pos pos)))) (when input-pos ------------------------------------------------------------ revno: 106100 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=114 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2011-10-17 12:30:02 -0400 message: * lisp/minibuffer.el (completion--replace): Inherit surrounding properties. (minibuffer-complete-and-exit): Use it. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-17 13:43:40 +0000 +++ lisp/ChangeLog 2011-10-17 16:30:02 +0000 @@ -1,5 +1,9 @@ 2011-10-17 Stefan Monnier + * minibuffer.el (completion--replace): Inherit surrounding properties + (bug#114). + (minibuffer-complete-and-exit): Use it. + * comint.el (comint--table-subvert): Quote the all-completions output (bug#9160). === modified file 'lisp/minibuffer.el' --- lisp/minibuffer.el 2011-10-11 05:17:04 +0000 +++ lisp/minibuffer.el 2011-10-17 16:30:02 +0000 @@ -596,7 +596,7 @@ (setq end (- end suffix-len)) (setq newtext (substring newtext 0 (- suffix-len)))) (goto-char beg) - (insert newtext) + (insert-and-inherit newtext) (delete-region (point) (+ (point) (- end beg))) (forward-char suffix-len))) @@ -927,9 +927,7 @@ ;; file, so `try-completion' actually completes to ;; that file. (= (length string) (length compl))) - (goto-char end) - (insert compl) - (delete-region beg end)))) + (completion--replace beg end compl)))) (exit-minibuffer)) ((memq minibuffer-completion-confirm '(confirm confirm-after-completion)) ------------------------------------------------------------ revno: 106099 fixes bug(s): http://debbugs.gnu.org/cgi/bugreport.cgi?bug=9160 committer: Stefan Monnier branch nick: trunk timestamp: Mon 2011-10-17 09:43:40 -0400 message: * lisp/comint.el (comint--table-subvert): Quote the all-completions output. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-17 13:27:53 +0000 +++ lisp/ChangeLog 2011-10-17 13:43:40 +0000 @@ -1,7 +1,11 @@ +2011-10-17 Stefan Monnier + + * comint.el (comint--table-subvert): Quote the all-completions output + (bug#9160). + 2011-10-17 Martin Rudalics - * ido.el (ido-default-buffer-method): Remove redundant :type - entry. + * ido.el (ido-default-buffer-method): Remove redundant :type entry. * menu-bar.el (menu-bar-file-menu): Add entry for making new window on right of selected. (Bug#9350) Reword other window @@ -14,8 +18,8 @@ 2011-10-15 Chong Yidong - * net/network-stream.el (network-stream-open-starttls): Improve - detection of failure due to lack of TLS support. + * net/network-stream.el (network-stream-open-starttls): + Improve detection of failure due to lack of TLS support. * mail/sendmail.el (sendmail-query-once): Tweak prompt message, putting the input text in front and in bold. === modified file 'lisp/comint.el' --- lisp/comint.el 2011-10-03 16:49:56 +0000 +++ lisp/comint.el 2011-10-17 13:43:40 +0000 @@ -3079,9 +3079,9 @@ (defun comint--table-subvert (table s1 s2 &optional quote-fun unquote-fun) "Completion table that replaces the prefix S1 with S2 in STRING. -When TABLE, S1 and S2 are provided by `apply-partially', the result -is a completion table which completes strings of the form (concat S1 S) -in the same way as TABLE completes strings of the form (concat S2 S)." +The result is a completion table which completes strings of the +form (concat S1 S) in the same way as TABLE completes strings of +the form (concat S2 S)." (lambda (string pred action) (let* ((str (if (eq t (compare-strings string 0 (length s1) s1 nil nil completion-ignore-case)) @@ -3106,13 +3106,15 @@ ((eq action t) (let ((bounds (completion-boundaries str table pred ""))) (if (>= (car bounds) (length s2)) - res + (if quote-fun (mapcar quote-fun res) res) (let ((re (concat "\\`" (regexp-quote (substring s2 (car bounds)))))) (delq nil (mapcar (lambda (c) (if (string-match re c) - (substring c (match-end 0)))) + (let ((str (substring c (match-end 0)))) + (if quote-fun + (funcall quote-fun str) str)))) res)))))) ;; E.g. action=nil and it's the only completion. (res)))))) ------------------------------------------------------------ revno: 106098 committer: martin rudalics branch nick: trunk timestamp: Mon 2011-10-17 15:27:53 +0200 message: Remove redundant :type entry from ido-default-buffer-method diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-17 13:11:46 +0000 +++ lisp/ChangeLog 2011-10-17 13:27:53 +0000 @@ -1,5 +1,8 @@ 2011-10-17 Martin Rudalics + * ido.el (ido-default-buffer-method): Remove redundant :type + entry. + * menu-bar.el (menu-bar-file-menu): Add entry for making new window on right of selected. (Bug#9350) Reword other window entries and separate them from frame entries. === modified file 'lisp/ido.el' --- lisp/ido.el 2011-09-27 09:28:03 +0000 +++ lisp/ido.el 2011-10-17 13:27:53 +0000 @@ -461,12 +461,6 @@ (const :tag "Show in other frame" other-frame) (const :tag "Ask to show in other frame" maybe-frame) (const :tag "Raise frame if already shown" raise-frame)) - :type '(choice (const selected-window) - (const other-window) - (const display) - (const other-frame) - (const maybe-frame) - (const raise-frame)) :group 'ido) (defcustom ido-enable-flex-matching nil ------------------------------------------------------------ revno: 106097 committer: martin rudalics branch nick: trunk timestamp: Mon 2011-10-17 15:11:46 +0200 message: Fix bug reference in ChangeLog diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-17 12:52:31 +0000 +++ lisp/ChangeLog 2011-10-17 13:11:46 +0000 @@ -1,7 +1,7 @@ 2011-10-17 Martin Rudalics * menu-bar.el (menu-bar-file-menu): Add entry for making new - window on right of selected. (Bug#6786) Reword other window + window on right of selected. (Bug#9350) Reword other window entries and separate them from frame entries. 2011-10-15 Glenn Morris ------------------------------------------------------------ revno: 106096 committer: martin rudalics branch nick: trunk timestamp: Mon 2011-10-17 14:52:31 +0200 message: Rewrite window related menu entries. (Bug#6786) * menu-bar.el (menu-bar-file-menu): Add entry for making new window on right of selected. (Bug#6786) Reword other window entries and separate them from frame entries. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2011-10-15 19:24:14 +0000 +++ lisp/ChangeLog 2011-10-17 12:52:31 +0000 @@ -1,3 +1,9 @@ +2011-10-17 Martin Rudalics + + * menu-bar.el (menu-bar-file-menu): Add entry for making new + window on right of selected. (Bug#6786) Reword other window + entries and separate them from frame entries. + 2011-10-15 Glenn Morris * emacs-lisp/ert.el (ert--explain-equal-rec, ert-select-tests): === modified file 'lisp/menu-bar.el' --- lisp/menu-bar.el 2011-09-18 20:43:20 +0000 +++ lisp/menu-bar.el 2011-10-17 12:52:31 +0000 @@ -92,17 +92,25 @@ :visible (fboundp 'make-frame-command) :help ,(purecopy "Open a new frame"))) + (define-key menu [separator-frame] + menu-bar-separator) + (define-key menu [one-window] - `(menu-item ,(purecopy "Remove Splits") delete-other-windows + `(menu-item ,(purecopy "Remove Other Windows") delete-other-windows :enable (not (one-window-p t nil)) - :help ,(purecopy - "Selected window grows to fill the whole frame"))) - - (define-key menu [split-window] - `(menu-item ,(purecopy "Split Window") split-window-vertically - :enable (and (menu-bar-menu-frame-live-and-visible-p) - (menu-bar-non-minibuffer-window-p)) - :help ,(purecopy "Split selected window in two windows"))) + :help ,(purecopy "Make selected window fill whole frame"))) + + (define-key menu [new-window-on-right] + `(menu-item ,(purecopy "New Window on Right") split-window-side-by-side + :enable (and (menu-bar-menu-frame-live-and-visible-p) + (menu-bar-non-minibuffer-window-p)) + :help ,(purecopy "Make new window on right of selected one"))) + + (define-key menu [new-window-below] + `(menu-item ,(purecopy "New Window Below") split-window-above-each-other + :enable (and (menu-bar-menu-frame-live-and-visible-p) + (menu-bar-non-minibuffer-window-p)) + :help ,(purecopy "Make new window below selected one"))) (define-key menu [separator-window] menu-bar-separator) @@ -433,7 +441,7 @@ (defvar menu-bar-edit-menu (let ((menu (make-sparse-keymap "Edit"))) - + (define-key menu [props] `(menu-item ,(purecopy "Text Properties") facemenu-menu)) @@ -1645,7 +1653,7 @@ (defvar menu-bar-search-documentation-menu (let ((menu (make-sparse-keymap "Search Documentation"))) - + (define-key menu [search-documentation-strings] `(menu-item ,(purecopy "Search Documentation Strings...") apropos-documentation :help