Permalink
Browse files

Merge branch 'emacs23'

(first merge from new Git repository)
Conflicts:
	INSTALL
	etc/NEWS
	lisp/progmodes/gdb-ui.el
	nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings
	src/nsfns.m
  • Loading branch information...
1 parent 09647ee commit 113e3b7bc45a8542c1118dd9229013ddd48d80f9 @davidswelt committed Jan 11, 2010
Showing with 3,799 additions and 6,446 deletions.
  1. +71 −0 .bzrignore
  2. +11 −1 ChangeLog
  3. +0 −1 INSTALL
  4. +813 −0 INSTALL
  5. +20 −35 INSTALL.CVS → INSTALL.BZR
  6. +1 −1 README
  7. +1 −1 autogen.sh
  8. +12 −12 configure
  9. +4 −4 configure.in
  10. +13 −0 doc/emacs/ChangeLog
  11. +56 −192 doc/emacs/building.texi
  12. +9 −11 doc/emacs/emacs.texi
  13. +7 −6 doc/emacs/mini.texi
  14. +8 −0 doc/emacs/misc.texi
  15. +35 −2 doc/lispref/ChangeLog
  16. +1 −1 doc/lispref/book-spine.texinfo
  17. +3 −4 doc/lispref/control.texi
  18. +1 −2 doc/lispref/display.texi
  19. +1 −1 doc/lispref/elisp.texi
  20. +8 −7 doc/lispref/loading.texi
  21. +4 −4 doc/lispref/minibuf.texi
  22. +2 −2 doc/lispref/modes.texi
  23. +29 −25 doc/lispref/nonascii.texi
  24. +1 −1 doc/lispref/os.texi
  25. +7 −5 doc/lispref/positions.texi
  26. +6 −7 doc/lispref/text.texi
  27. +1 −2 doc/lispref/variables.texi
  28. +1 −1 doc/lispref/vol1.texi
  29. +1 −1 doc/lispref/vol2.texi
  30. +1 −1 doc/man/ChangeLog
  31. +1 −1 doc/man/emacs.1
  32. +11 −1 doc/misc/ChangeLog
  33. +1 −1 doc/misc/calc.texi
  34. +6 −6 doc/misc/eieio.texi
  35. +1 −1 doc/misc/faq.texi
  36. +2 −3 doc/misc/gnus.texi
  37. +30 −30 etc/AUTHORS
  38. +7 −3 etc/ChangeLog
  39. +54 −33 etc/NEWS
  40. +11 −6 etc/images/gud/README
  41. +4 −4 leim/ChangeLog
  42. +1 −1 lib-src/ChangeLog
  43. +1 −1 lib-src/makefile.w32-in
  44. +275 −20 lisp/ChangeLog
  45. +5 −5 lisp/ChangeLog.7
  46. +5 −2 lisp/Makefile.in
  47. +210 −245 lisp/bookmark.el
  48. +2 −2 lisp/cedet/semantic/db-typecache.el
  49. +5 −2 lisp/comint.el
  50. +1 −1 lisp/dired.el
  51. +5 −5 lisp/ediff-mult.el
  52. +6 −2 lisp/emacs-lisp/easy-mmode.el
  53. +1 −1 lisp/erc/ChangeLog
  54. +6 −2 lisp/files.el
  55. +17 −0 lisp/font-lock.el
  56. +1 −1 lisp/font-setting.el
  57. +33 −2 lisp/gnus/ChangeLog
  58. +8 −1 lisp/gnus/gnus-art.el
  59. +29 −6 lisp/gnus/gnus-sum.el
  60. +23 −0 lisp/gnus/gnus-util.el
  61. +4 −5 lisp/gnus/message.el
  62. +3 −3 lisp/language/indian.el
  63. +864 −980 lisp/ldefs-boot.el
  64. +5 −2 lisp/makefile.w32-in
  65. +7 −7 lisp/mh-e/ChangeLog
  66. +1 −1 lisp/mpc.el
  67. +7 −5 lisp/net/browse-url.el
  68. +44 −44 lisp/net/imap-hash.el
  69. +1 −0 lisp/net/rcirc.el
  70. +9 −4 lisp/org/ChangeLog
  71. +5 −5 lisp/org/org.el
  72. +2 −2 lisp/play/gomoku.el
  73. +0 −4,192 lisp/progmodes/gdb-mi.el
  74. +324 −162 lisp/progmodes/gdb-ui.el
  75. +59 −27 lisp/progmodes/gud.el
  76. +28 −27 lisp/progmodes/idlw-help.el
  77. +21 −13 lisp/progmodes/octave-mod.el
  78. +4 −2 lisp/progmodes/python.el
  79. +4 −0 lisp/term/x-win.el
  80. +1 −1 lisp/url/ChangeLog
  81. +59 −28 lisp/vc-bzr.el
  82. +1 −1 lisp/vc-git.el
  83. +2 −5 lisp/vc-hg.el
  84. +2 −0 lisp/vc-rcs.el
  85. +1 −1 lisp/version.el
  86. +1 −1 lwlib/ChangeLog
  87. +2 −2 nextstep/Cocoa/Emacs.base/Contents/Info.plist
  88. +1 −1 nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop
  89. +2 −2 nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist
  90. +8 −0 nt/ChangeLog
  91. +20 −41 nt/INSTALL
  92. +4 −4 nt/emacs.rc
  93. +4 −4 nt/emacsclient.rc
  94. +97 −14 src/ChangeLog
  95. +16 −7 src/dbusbind.c
  96. +21 −12 src/eval.c
  97. +22 −15 src/font.c
  98. +8 −0 src/font.h
  99. +2 −2 src/fontset.c
  100. +72 −3 src/gtkutil.c
  101. +7 −1 src/keyboard.c
  102. +14 −14 src/lread.c
  103. +13 −18 src/nsfns.m
  104. +2 −1 src/nsterm.m
  105. +1 −1 src/process.c
  106. +101 −42 src/xftfont.c
  107. +33 −26 src/xterm.c
View
@@ -0,0 +1,71 @@
+./bin
+./BIN
+./data
+./etc/icons
+./lock
+./site-lisp
+./_dir-locals.el
+./config.log
+./config.status
+oo
+oo-spd
+autom4te.cache
+*.elc
+DOC
+DOC-*
+makefile
+Makefile
+Makefile.c
+stamp_BLD
+subdirs.el
+TAGS
+info/*
+leim/leim-list.el
+leim/quail/*.el
+leim/changed.misc
+leim/changed.tit
+lib-src/ctags.c
+lib-src/echolisp.tmp
+lib-src/getopt.h
+lib-src/b2m
+lib-src/ctags
+lib-src/digest-doc
+lib-src/digest-doc.exe
+lib-src/ebrowse
+lib-src/emacsclient
+lib-src/etags
+lib-src/fakemail
+lib-src/fakemail.exe
+lib-src/hexl
+lib-src/make-docfile
+lib-src/make-docfile.exe
+lib-src/movemail
+lib-src/profile
+lib-src/profile.exe
+lib-src/sorted-doc
+lib-src/sorted-doc.exe
+lib-src/test-distrib
+lib-src/test-distrib.exe
+lib-src/update-game-score
+lib-src/update-game-score.exe
+lisp/**/*-loaddefs.el
+lisp/**/loaddefs.el
+lisp/cus-load.el
+lisp/eshell/esh-groups.el
+lisp/finder-inf.el
+nt/config.log
+src/buildobj.h
+src/config.h
+src/epaths.h
+src/_dbxinit
+src/_gdbinit
+src/gdb.ini
+src/bootstrap-emacs
+src/b-emacs.exe
+src/emacs
+src/emacs-*
+src/prefix-args*
+src/stamp-oldxmenu
+src/temacs
+src/temacs.exe
+src/deps
View
@@ -1,3 +1,13 @@
+2010-01-02 Eli Zaretskii <eliz@gnu.org>
+
+ * .bzrignore: Add more ignored patterns, including for the MS-DOS
+ build.
+
+2009-12-27 Karl Fogel <kfogel@red-bean>
+
+ * INSTALL.BZR: Rename from INSTALL.CVS; edit to talk about Bazaar.
+ * INSTALL, autogen.sh, configure.in, configure: Adjust accordingly.
+
2009-12-17 Glenn Morris <rgm@gnu.org>
* .dir-locals.el (bug-reference-url-format): Change to debbugs.gnu.org.
@@ -52,7 +62,7 @@
2009-11-14 Jan Djärv <jan.h.d@swipnet.se>
* configure.in: --enable-autodepend is new. Check for GNU Make
- and that gcc supports -MMD -MF. Define AUTO_DEPEND if we can use
+ and that gcc supports -MMD -MF. Define AUTO_DEPEND if we can use
gcc and GNU make to generate dependencies.
2009-10-27 Glenn Morris <rgm@gnu.org>
View
Oops, something went wrong.

0 comments on commit 113e3b7

Please sign in to comment.