diff options
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 28 | ||||
| -rw-r--r-- | lisp/cedet/semantic/db-find.el | 2 | ||||
| -rw-r--r-- | lisp/cedet/semantic/imenu.el | 8 | ||||
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/gnus/mm-uu.el | 6 | ||||
| -rw-r--r-- | lisp/ldefs-boot.el | 221 |
6 files changed, 243 insertions, 27 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 83f666881d6..2b77770180d 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2010-04-02 Juanma Barranquero <lekktu@gmail.com> + + * cedet/semantic/imenu.el (semantic-imenu-bucketize-type-members) + (semantic-create-imenu-directory-index): Fix typos in docstrings. + (semantic-imenu-goto-function): Reflow docstring. + 2010-04-02 Juri Linkov <juri@jurta.org> * ehelp.el (electric-help-orig-major-mode): @@ -3881,7 +3887,7 @@ * bookmark.el: Formatting and doc fixes only: (bookmark-search-delay): Shorten doc string to fit in 80 columns. (bookmark-bmenu-search): Wrap to fit within 80 columns. - Minor grammar and punctuation fixes in doc string. + Minor grammar and punctuation fixes in doc string. (bookmark-read-search-input): Adjust to fit within 80 columns. 2009-11-20 Tassilo Horn <tassilo@member.fsf.org> @@ -6636,12 +6642,12 @@ 2009-10-05 Karl Fogel <kfogel@red-bean.com> * bookmark.el (bookmark-handle-bookmark): If bookmark has no file, - don't do anything related to relocating, just return nil. + don't do anything related to relocating, just return nil. (bookmark-error-no-filename): New error. (bookmark-default-handler): Signal `bookmark-error-no-filename' if - bookmark has no file. Don't even attempt to handle things that - are not files; the whole point of custom handlers is to keep that - knowledge elsewhere anyway. Tighten some comments. + bookmark has no file. Don't even attempt to handle things that + are not files; the whole point of custom handlers is to keep that + knowledge elsewhere anyway. Tighten some comments. (bookmark-file-or-variation-thereof): Remove now-unused function. (bookmark-location): Doc string fix. (Bug#4250) @@ -6671,8 +6677,8 @@ (bookmark-relocate, bookmark-insert-location, bookmark-rename) (bookmark-insert, bookmark-delete, bookmark-time-to-save-p) (bookmark-edit-annotation-mode, bookmark-edit-annotation): - Improve doc strings to say whether bookmark can be a string or - a record or both, and make other consistency and clarity fixes. + Improve doc strings to say whether bookmark can be a string or + a record or both, and make other consistency and clarity fixes. (bookmark-get-handler, bookmark--jump-via, bookmark-write-file) (bookmark-default-annotation-text, bookmark-yank-word) (bookmark-maybe-load-default-file, bookmark-maybe-sort-alist) @@ -6680,12 +6686,12 @@ (bookmark-bmenu-show-filenames, bookmark-bmenu-hide-filenames) (bookmark-bmenu-bookmark): Give these doc strings. (bookmark-bmenu-check-position): Give this a doc string, but also - add a FIXME comment about how the function may be pointless. + add a FIXME comment about how the function may be pointless. (bookmark-default-handler): Rework doc string and change a - parameter name, to clarify that this takes a bookmark record - not a bookmark name. + parameter name, to clarify that this takes a bookmark record + not a bookmark name. (bookmark-set): Change a parameter name to indicate its meaning, - and improve the doc string a bit. + and improve the doc string a bit. (Bug#4188) 2009-10-04 Karl Fogel <kfogel@red-bean.com> diff --git a/lisp/cedet/semantic/db-find.el b/lisp/cedet/semantic/db-find.el index 754ba231c37..4c2626ca8bd 100644 --- a/lisp/cedet/semantic/db-find.el +++ b/lisp/cedet/semantic/db-find.el @@ -774,7 +774,7 @@ Examines the variable `semanticdb-find-lost-includes'." (buffer-name)) (data-debug-new-buffer "*SEMANTICDB lost-includes ADEBUG*") - (data-debug-insert-tag-list lost "*") + ;; (data-debug-insert-tag-list lost "*") ))) (defun semanticdb-find-adebug-insert-scanned-tag-cons (consdata prefix prebuttontext) diff --git a/lisp/cedet/semantic/imenu.el b/lisp/cedet/semantic/imenu.el index 3c73b893925..9ce986553aa 100644 --- a/lisp/cedet/semantic/imenu.el +++ b/lisp/cedet/semantic/imenu.el @@ -95,7 +95,7 @@ This option is ignored if `semantic-imenu-bucketize-file' is nil." (defcustom semantic-imenu-bucketize-type-members t "*Non-nil if members of a type should be grouped into buckets. -nil means to keep them in the same order. +A nil value means to keep them in the same order. Overriden to nil if `semantic-imenu-bucketize-file' is nil." :group 'semantic-imenu :type 'boolean) @@ -167,8 +167,8 @@ concoct a combination of file name, and position." (defun semantic-imenu-goto-function (name position &optional rest) "Move point associated with NAME to POSITION. -Used to override function `imenu-default-goto-function' so that we can continue -to use overlays to maintain the current position. +Used to override function `imenu-default-goto-function' so that +we can continue to use overlays to maintain the current position. Optional argument REST is some extra stuff." (require 'pulse) (if (semantic-overlay-p position) @@ -249,7 +249,7 @@ Optional argument STREAM is an optional stream of tags used to create menus." 'semantic-imenu-flush-fcn nil t))) (defun semantic-create-imenu-directory-index (&optional stream) - "Create an IMENU tag index based on all files active in semanticdb. + "Create an imenu tag index based on all files active in semanticdb. Optional argument STREAM is the stream of tags for the current buffer." (if (not semanticdb-current-database) (semantic-create-imenu-index-1 stream nil) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index afdde02dfd9..e418c5f9f5a 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -1,3 +1,8 @@ +2010-04-01 Andreas Schwab <schwab@linux-m68k.org> + + * mm-uu.el (mm-uu-pgp-signed-extract-1): Use buffer-file-coding-system + if set. + 2010-03-31 Katsumi Yamaoka <yamaoka@jpl.org> * gnus-art.el (gnus-article-browse-html-save-cid-content): Rename from diff --git a/lisp/gnus/mm-uu.el b/lisp/gnus/mm-uu.el index c690713ef14..5ae9205e2f0 100644 --- a/lisp/gnus/mm-uu.el +++ b/lisp/gnus/mm-uu.el @@ -486,9 +486,11 @@ apply the face `mm-uu-extract'." (if (mm-uu-pgp-signed-test) (progn (mml2015-clean-buffer) - (let ((coding-system-for-write (or gnus-newsgroup-charset + (let ((coding-system-for-write (or buffer-file-coding-system + gnus-newsgroup-charset 'iso-8859-1)) - (coding-system-for-read (or gnus-newsgroup-charset + (coding-system-for-read (or buffer-file-coding-system + gnus-newsgroup-charset 'iso-8859-1))) (funcall (mml2015-clear-verify-function)))) (when (and mml2015-use (null (mml2015-clear-verify-function))) diff --git a/lisp/ldefs-boot.el b/lisp/ldefs-boot.el index 493f1a7b577..de72b92eb07 100644 --- a/lisp/ldefs-boot.el +++ b/lisp/ldefs-boot.el @@ -1319,7 +1319,7 @@ Selecting operation Variables - This is a brief overview of the different varaibles. For more info, + This is a brief overview of the different variables. For more info, see the documentation for the variables (type \\[describe-variable] <variable> RET). artist-rubber-banding Interactively do rubber-banding or not @@ -10464,7 +10464,13 @@ Turn flymake mode off. ;;;### (autoloads (flyspell-buffer flyspell-region flyspell-mode-off ;;;;;; turn-off-flyspell turn-on-flyspell flyspell-mode flyspell-prog-mode) +<<<<<<< TREE ;;;;;; "flyspell" "textmodes/flyspell.el" (19370 36541)) +||||||| BASE-REVISION +;;;;;; "flyspell" "textmodes/flyspell.el" (19352 21362)) +======= +;;;;;; "flyspell" "textmodes/flyspell.el" (19369 7847)) +>>>>>>> MERGE-SOURCE ;;; Generated autoloads from textmodes/flyspell.el (autoload 'flyspell-prog-mode "flyspell" "\ @@ -10786,6 +10792,7 @@ and choose the directory as the fortune-file. ;;;*** +<<<<<<< TREE ;;;### (autoloads (gdb gdb-enable-debug) "gdb-mi" "progmodes/gdb-mi.el" ;;;;;; (19375 49830)) ;;; Generated autoloads from progmodes/gdb-mi.el @@ -10796,6 +10803,19 @@ Non-nil means record the process input and output in `gdb-debug-log'.") (custom-autoload 'gdb-enable-debug "gdb-mi" t) (autoload 'gdb "gdb-mi" "\ +||||||| BASE-REVISION +;;;### (autoloads (gdb-enable-debug gdb) "gdb-ui" "progmodes/gdb-ui.el" +;;;;;; (19352 21362)) +;;; Generated autoloads from progmodes/gdb-ui.el + +(autoload 'gdb "gdb-ui" "\ +======= +;;;### (autoloads (gdb-enable-debug gdb) "gdb-ui" "progmodes/gdb-ui.el" +;;;;;; (19372 60979)) +;;; Generated autoloads from progmodes/gdb-ui.el + +(autoload 'gdb "gdb-ui" "\ +>>>>>>> MERGE-SOURCE Run gdb on program FILE in buffer *gud-FILE*. The directory containing FILE becomes the initial working directory and source-file directory for your debugger. @@ -13649,8 +13669,16 @@ The main features of this mode are ;;;;;; ido-find-alternate-file ido-find-file-other-window ido-find-file ;;;;;; ido-find-file-in-dir ido-switch-buffer-other-frame ido-insert-buffer ;;;;;; ido-kill-buffer ido-display-buffer ido-switch-buffer-other-window +<<<<<<< TREE ;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19292 ;;;;;; 15231)) +||||||| BASE-REVISION +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19352 +;;;;;; 21354)) +======= +;;;;;; ido-switch-buffer ido-mode ido-mode) "ido" "ido.el" (19355 +;;;;;; 62587)) +>>>>>>> MERGE-SOURCE ;;; Generated autoloads from ido.el (defvar ido-mode nil "\ @@ -14142,7 +14170,13 @@ Images should not be larger than specified by `max-image-size'. ;;;;;; image-dired-jump-thumbnail-buffer image-dired-delete-tag ;;;;;; image-dired-tag-files image-dired-show-all-from-dir image-dired-display-thumbs ;;;;;; image-dired-dired-with-window-configuration image-dired-dired-insert-marked-thumbs) +<<<<<<< TREE ;;;;;; "image-dired" "image-dired.el" (19370 36540)) +||||||| BASE-REVISION +;;;;;; "image-dired" "image-dired.el" (19352 21354)) +======= +;;;;;; "image-dired" "image-dired.el" (19367 42949)) +>>>>>>> MERGE-SOURCE ;;; Generated autoloads from image-dired.el (autoload 'image-dired-dired-insert-marked-thumbs "image-dired" "\ @@ -15394,7 +15428,13 @@ by `jka-compr-installed'. ;;;*** +<<<<<<< TREE ;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19279 5151)) +||||||| BASE-REVISION +;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19352 21355)) +======= +;;;### (autoloads (js-mode) "js" "progmodes/js.el" (19375 48608)) +>>>>>>> MERGE-SOURCE ;;; Generated autoloads from progmodes/js.el (autoload 'js-mode "js" "\ @@ -16503,7 +16543,13 @@ The mail client is taken to be the handler of mailto URLs. ;;;### (autoloads (makefile-imake-mode makefile-bsdmake-mode makefile-makepp-mode ;;;;;; makefile-gmake-mode makefile-automake-mode makefile-mode) +<<<<<<< TREE ;;;;;; "make-mode" "progmodes/make-mode.el" (19372 27330)) +||||||| BASE-REVISION +;;;;;; "make-mode" "progmodes/make-mode.el" (19352 21355)) +======= +;;;;;; "make-mode" "progmodes/make-mode.el" (19370 15152)) +>>>>>>> MERGE-SOURCE ;;; Generated autoloads from progmodes/make-mode.el (autoload 'makefile-mode "make-mode" "\ @@ -16735,7 +16781,13 @@ Returns non-nil if the new state is enabled. ;;;;;; message-forward-make-body message-forward message-recover ;;;;;; message-supersede message-cancel-news message-followup message-wide-reply ;;;;;; message-reply message-news message-mail message-mode) "message" +<<<<<<< TREE ;;;;;; "gnus/message.el" (19370 36541)) +||||||| BASE-REVISION +;;;;;; "gnus/message.el" (19352 21361)) +======= +;;;;;; "gnus/message.el" (19374 17766)) +>>>>>>> MERGE-SOURCE ;;; Generated autoloads from gnus/message.el (define-mail-user-agent 'message-user-agent 'message-mail 'message-send-and-exit 'message-kill-buffer 'message-send-hook) @@ -17381,7 +17433,13 @@ Insert file contents of URL using `mm-url-program'. ;;;*** ;;;### (autoloads (mm-uu-dissect-text-parts mm-uu-dissect) "mm-uu" +<<<<<<< TREE ;;;;;; "gnus/mm-uu.el" (19279 5150)) +||||||| BASE-REVISION +;;;;;; "gnus/mm-uu.el" (19352 21355)) +======= +;;;;;; "gnus/mm-uu.el" (19382 2266)) +>>>>>>> MERGE-SOURCE ;;; Generated autoloads from gnus/mm-uu.el (autoload 'mm-uu-dissect "mm-uu" "\ @@ -22607,8 +22665,16 @@ of master file. ;;;*** +<<<<<<< TREE ;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (19370 ;;;;;; 36541)) +||||||| BASE-REVISION +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (19352 +;;;;;; 21358)) +======= +;;;### (autoloads nil "reftex-vars" "textmodes/reftex-vars.el" (19367 +;;;;;; 42950)) +>>>>>>> MERGE-SOURCE ;;; Generated autoloads from textmodes/reftex-vars.el (put 'reftex-vref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) (put 'reftex-fref-is-default 'safe-local-variable (lambda (x) (or (stringp x) (symbolp x)))) @@ -22860,8 +22926,16 @@ variable. ;;;;;; rmail-secondary-file-directory rmail-primary-inbox-list rmail-highlighted-headers ;;;;;; rmail-retry-ignored-headers rmail-displayed-headers rmail-ignored-headers ;;;;;; rmail-dont-reply-to-names rmail-user-mail-address-regexp +<<<<<<< TREE ;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19370 ;;;;;; 36541)) +||||||| BASE-REVISION +;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19352 +;;;;;; 21360)) +======= +;;;;;; rmail-movemail-variant-p) "rmail" "mail/rmail.el" (19363 +;;;;;; 36802)) +>>>>>>> MERGE-SOURCE ;;; Generated autoloads from mail/rmail.el (autoload 'rmail-movemail-variant-p "rmail" "\ @@ -23828,7 +23902,13 @@ Semantic mode. ;;;;;; mail-alias-file mail-default-reply-to mail-archive-file-name ;;;;;; mail-header-separator send-mail-function mail-interactive ;;;;;; mail-self-blind mail-specify-envelope-from mail-from-style) +<<<<<<< TREE ;;;;;; "sendmail" "mail/sendmail.el" (19338 9841)) +||||||| BASE-REVISION +;;;;;; "sendmail" "mail/sendmail.el" (19352 21361)) +======= +;;;;;; "sendmail" "mail/sendmail.el" (19374 15070)) +>>>>>>> MERGE-SOURCE ;;; Generated autoloads from mail/sendmail.el (defvar mail-from-style 'default "\ @@ -23982,9 +24062,11 @@ File containing the text inserted at end of mail buffer.") (custom-autoload 'mail-signature-file "sendmail" t) (defvar mail-default-directory (purecopy "~/") "\ -Directory for mail buffers. -Value of `default-directory' for mail buffers. -This directory is used for auto-save files of mail buffers.") +Value of `default-directory' for Mail mode buffers. +This directory is used for auto-save files of Mail mode buffers. + +Note that Message mode does not use this variable; it auto-saves +in `message-auto-save-directory'.") (custom-autoload 'mail-default-directory "sendmail" t) @@ -24705,7 +24787,13 @@ If no conflict maker is found, turn off `smerge-mode'. ;;;*** ;;;### (autoloads (smiley-buffer smiley-region) "smiley" "gnus/smiley.el" +<<<<<<< TREE ;;;;;; (19370 36541)) +||||||| BASE-REVISION +;;;;;; (19352 21358)) +======= +;;;;;; (19367 42950)) +>>>>>>> MERGE-SOURCE ;;; Generated autoloads from gnus/smiley.el (autoload 'smiley-region "smiley" "\ @@ -26723,7 +26811,13 @@ tetris-mode keybindings: ;;;;;; tex-start-commands tex-start-options slitex-run-command latex-run-command ;;;;;; tex-run-command tex-offer-save tex-main-file tex-first-line-header-regexp ;;;;;; tex-directory tex-shell-file-name) "tex-mode" "textmodes/tex-mode.el" +<<<<<<< TREE ;;;;;; (19323 49698)) +||||||| BASE-REVISION +;;;;;; (19352 21363)) +======= +;;;;;; (19371 46148)) +>>>>>>> MERGE-SOURCE ;;; Generated autoloads from textmodes/tex-mode.el (defvar tex-shell-file-name nil "\ @@ -27718,7 +27812,13 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\". ;;;*** ;;;### (autoloads (tmm-prompt tmm-menubar-mouse tmm-menubar) "tmm" +<<<<<<< TREE ;;;;;; "tmm.el" (19279 5148)) +||||||| BASE-REVISION +;;;;;; "tmm.el" (19352 21359)) +======= +;;;;;; "tmm.el" (19376 53416)) +>>>>>>> MERGE-SOURCE ;;; Generated autoloads from tmm.el (define-key global-map "\M-`" 'tmm-menubar) (define-key global-map [menu-bar mouse-1] 'tmm-menubar-mouse) @@ -27968,7 +28068,13 @@ to a tcp server on another machine. ;;;*** ;;;### (autoloads (trace-function-background trace-function trace-buffer) +<<<<<<< TREE ;;;;;; "trace" "emacs-lisp/trace.el" (19370 36541)) +||||||| BASE-REVISION +;;;;;; "trace" "emacs-lisp/trace.el" (19352 21359)) +======= +;;;;;; "trace" "emacs-lisp/trace.el" (19367 42950)) +>>>>>>> MERGE-SOURCE ;;; Generated autoloads from emacs-lisp/trace.el (defvar trace-buffer (purecopy "*trace-output*") "\ @@ -28005,7 +28111,13 @@ BUFFER defaults to `trace-buffer'. ;;;### (autoloads (tramp-unload-tramp tramp-completion-handle-file-name-completion ;;;;;; tramp-completion-handle-file-name-all-completions tramp-unload-file-name-handlers ;;;;;; tramp-file-name-handler tramp-syntax tramp-mode) "tramp" +<<<<<<< TREE ;;;;;; "net/tramp.el" (19370 36541)) +||||||| BASE-REVISION +;;;;;; "net/tramp.el" (19352 21361)) +======= +;;;;;; "net/tramp.el" (19356 59749)) +>>>>>>> MERGE-SOURCE ;;; Generated autoloads from net/tramp.el (defvar tramp-mode t "\ @@ -29228,7 +29340,13 @@ If FILE-NAME is non-nil, save the result to FILE-NAME. ;;;;;; vc-create-tag vc-merge vc-insert-headers vc-revision-other-window ;;;;;; vc-root-diff vc-diff vc-version-diff vc-register vc-next-action ;;;;;; vc-before-checkin-hook vc-checkin-hook vc-checkout-hook) +<<<<<<< TREE ;;;;;; "vc" "vc.el" (19370 36540)) +||||||| BASE-REVISION +;;;;;; "vc" "vc.el" (19352 21359)) +======= +;;;;;; "vc" "vc.el" (19371 62620)) +>>>>>>> MERGE-SOURCE ;;; Generated autoloads from vc.el (defvar vc-checkout-hook nil "\ @@ -29315,9 +29433,10 @@ saving the buffer. \(fn HISTORIC &optional NOT-URGENT)" t nil) (autoload 'vc-root-diff "vc" "\ -Display diffs between file revisions. -Normally this compares the currently selected fileset with their -working revisions. With a prefix argument HISTORIC, it reads two revision +Display diffs between VC-controlled whole tree revisions. +Normally, this compares the tree corresponding to the current +fileset with the working revision. +With a prefix argument HISTORIC, prompt for two revision designators specifying which revisions to compare. The optional argument NOT-URGENT non-nil means it is ok to say no to @@ -29372,12 +29491,20 @@ allowed and simply skipped). (autoload 'vc-print-log "vc" "\ List the change log of the current fileset in a window. -If WORKING-REVISION is non-nil, leave the point at that revision. +If WORKING-REVISION is non-nil, leave point at that revision. +If LIMIT is non-nil, it should be a number specifying the maximum +number of revisions to show; the default is `vc-log-show-limit'. + +When called interactively with a prefix argument, prompt for +WORKING-REVISION and LIMIT. \(fn &optional WORKING-REVISION LIMIT)" t nil) (autoload 'vc-print-root-log "vc" "\ -List the change log of for the current VC controlled tree in a window. +List the change log for the current VC controlled tree in a window. +If LIMIT is non-nil, it should be a number specifying the maximum +number of revisions to show; the default is `vc-log-show-limit'. +When called interactively with a prefix argument, prompt for LIMIT. \(fn &optional LIMIT)" t nil) @@ -31480,7 +31607,13 @@ With arg, turn Winner mode on if and only if arg is positive. ;;;*** ;;;### (autoloads (woman-find-file woman-dired-find-file woman woman-locale) +<<<<<<< TREE ;;;;;; "woman" "woman.el" (19370 36540)) +||||||| BASE-REVISION +;;;;;; "woman" "woman.el" (19352 21359)) +======= +;;;;;; "woman" "woman.el" (19359 48737)) +>>>>>>> MERGE-SOURCE ;;; Generated autoloads from woman.el (defvar woman-locale nil "\ @@ -31834,6 +31967,7 @@ Zone out, completely. ;;;;;; "cedet/semantic/edit.el" "cedet/semantic/find.el" "cedet/semantic/format.el" ;;;;;; "cedet/semantic/fw.el" "cedet/semantic/grammar-wy.el" "cedet/semantic/grammar.el" ;;;;;; "cedet/semantic/html.el" "cedet/semantic/ia-sb.el" "cedet/semantic/ia.el" +<<<<<<< TREE ;;;;;; "cedet/semantic/idle.el" "cedet/semantic/imenu.el" "cedet/semantic/java.el" ;;;;;; "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/loaddefs.el" ;;;;;; "cedet/semantic/mru-bookmark.el" "cedet/semantic/sb.el" "cedet/semantic/scope.el" @@ -31842,6 +31976,25 @@ Zone out, completely. ;;;;;; "cedet/semantic/symref/global.el" "cedet/semantic/symref/grep.el" ;;;;;; "cedet/semantic/symref/idutils.el" "cedet/semantic/symref/list.el" ;;;;;; "cedet/semantic/tag-file.el" "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el" +||||||| BASE-REVISION +;;;;;; "cedet/semantic/idle.el" "cedet/semantic/java.el" "cedet/semantic/lex-spp.el" +;;;;;; "cedet/semantic/lex.el" "cedet/semantic/mru-bookmark.el" +;;;;;; "cedet/semantic/sb.el" "cedet/semantic/scope.el" "cedet/semantic/senator.el" +;;;;;; "cedet/semantic/sort.el" "cedet/semantic/symref.el" "cedet/semantic/symref/cscope.el" +;;;;;; "cedet/semantic/symref/filter.el" "cedet/semantic/symref/global.el" +;;;;;; "cedet/semantic/symref/grep.el" "cedet/semantic/symref/idutils.el" +;;;;;; "cedet/semantic/symref/list.el" "cedet/semantic/tag-file.el" +;;;;;; "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el" +======= +;;;;;; "cedet/semantic/idle.el" "cedet/semantic/imenu.el" "cedet/semantic/java.el" +;;;;;; "cedet/semantic/lex-spp.el" "cedet/semantic/lex.el" "cedet/semantic/mru-bookmark.el" +;;;;;; "cedet/semantic/sb.el" "cedet/semantic/scope.el" "cedet/semantic/senator.el" +;;;;;; "cedet/semantic/sort.el" "cedet/semantic/symref.el" "cedet/semantic/symref/cscope.el" +;;;;;; "cedet/semantic/symref/filter.el" "cedet/semantic/symref/global.el" +;;;;;; "cedet/semantic/symref/grep.el" "cedet/semantic/symref/idutils.el" +;;;;;; "cedet/semantic/symref/list.el" "cedet/semantic/tag-file.el" +;;;;;; "cedet/semantic/tag-ls.el" "cedet/semantic/tag-write.el" +>>>>>>> MERGE-SOURCE ;;;;;; "cedet/semantic/tag.el" "cedet/semantic/texi.el" "cedet/semantic/util-modes.el" ;;;;;; "cedet/semantic/util.el" "cedet/semantic/wisent.el" "cedet/semantic/wisent/comp.el" ;;;;;; "cedet/semantic/wisent/java-tags.el" "cedet/semantic/wisent/javascript.el" @@ -31955,6 +32108,7 @@ Zone out, completely. ;;;;;; "org/org-mac-message.el" "org/org-macs.el" "org/org-mew.el" ;;;;;; "org/org-mhe.el" "org/org-mouse.el" "org/org-protocol.el" ;;;;;; "org/org-rmail.el" "org/org-src.el" "org/org-vm.el" "org/org-w3m.el" +<<<<<<< TREE ;;;;;; "org/org-wl.el" "patcomp.el" "pcvs-info.el" "pcvs-parse.el" ;;;;;; "pcvs-util.el" "pgg-def.el" "pgg-parse.el" "pgg-pgp.el" "pgg-pgp5.el" ;;;;;; "play/gamegrid.el" "play/gametree.el" "play/meese.el" "progmodes/ada-prj.el" @@ -31977,6 +32131,55 @@ Zone out, completely. ;;;;;; "url/url-nfs.el" "url/url-proxy.el" "url/url-vars.el" "vc-dav.el" ;;;;;; "vcursor.el" "vt-control.el" "vt100-led.el" "w32-fns.el" ;;;;;; "w32-vars.el" "x-dnd.el") (19375 51700 955763)) +||||||| BASE-REVISION +;;;;;; "org/org-wl.el" "password-cache.el" "patcomp.el" "pcvs-info.el" +;;;;;; "pcvs-parse.el" "pcvs-util.el" "pgg-def.el" "pgg-parse.el" +;;;;;; "pgg-pgp.el" "pgg-pgp5.el" "play/gamegrid.el" "play/gametree.el" +;;;;;; "play/meese.el" "progmodes/ada-prj.el" "progmodes/cc-align.el" +;;;;;; "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el" "progmodes/cc-cmds.el" +;;;;;; "progmodes/cc-defs.el" "progmodes/cc-fonts.el" "progmodes/cc-langs.el" +;;;;;; "progmodes/cc-menus.el" "progmodes/ebnf-abn.el" "progmodes/ebnf-bnf.el" +;;;;;; "progmodes/ebnf-dtd.el" "progmodes/ebnf-ebx.el" "progmodes/ebnf-iso.el" +;;;;;; "progmodes/ebnf-otz.el" "progmodes/ebnf-yac.el" "progmodes/idlw-complete-structtag.el" +;;;;;; "progmodes/idlw-help.el" "progmodes/idlw-toolbar.el" "progmodes/mantemp.el" +;;;;;; "progmodes/xscheme.el" "ps-def.el" "ps-mule.el" "ps-samp.el" +;;;;;; "s-region.el" "saveplace.el" "sb-image.el" "scroll-bar.el" +;;;;;; "select.el" "soundex.el" "subdirs.el" "tempo.el" "textmodes/bib-mode.el" +;;;;;; "textmodes/makeinfo.el" "textmodes/page-ext.el" "textmodes/refbib.el" +;;;;;; "textmodes/refer.el" "textmodes/reftex-auc.el" "textmodes/reftex-dcr.el" +;;;;;; "textmodes/reftex-ref.el" "textmodes/reftex-sel.el" "textmodes/reftex-toc.el" +;;;;;; "textmodes/texnfo-upd.el" "timezone.el" "tooltip.el" "tree-widget.el" +;;;;;; "uniquify.el" "url/url-about.el" "url/url-cookie.el" "url/url-dired.el" +;;;;;; "url/url-expand.el" "url/url-ftp.el" "url/url-history.el" +;;;;;; "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el" +;;;;;; "url/url-vars.el" "vc-dav.el" "vcursor.el" "vt-control.el" +;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19352 +;;;;;; 23109 108328)) +======= +;;;;;; "org/org-wl.el" "password-cache.el" "patcomp.el" "pcvs-info.el" +;;;;;; "pcvs-parse.el" "pcvs-util.el" "pgg-def.el" "pgg-parse.el" +;;;;;; "pgg-pgp.el" "pgg-pgp5.el" "play/gamegrid.el" "play/gametree.el" +;;;;;; "play/meese.el" "progmodes/ada-prj.el" "progmodes/cc-align.el" +;;;;;; "progmodes/cc-awk.el" "progmodes/cc-bytecomp.el" "progmodes/cc-cmds.el" +;;;;;; "progmodes/cc-defs.el" "progmodes/cc-fonts.el" "progmodes/cc-langs.el" +;;;;;; "progmodes/cc-menus.el" "progmodes/ebnf-abn.el" "progmodes/ebnf-bnf.el" +;;;;;; "progmodes/ebnf-dtd.el" "progmodes/ebnf-ebx.el" "progmodes/ebnf-iso.el" +;;;;;; "progmodes/ebnf-otz.el" "progmodes/ebnf-yac.el" "progmodes/idlw-complete-structtag.el" +;;;;;; "progmodes/idlw-help.el" "progmodes/idlw-toolbar.el" "progmodes/mantemp.el" +;;;;;; "progmodes/xscheme.el" "ps-def.el" "ps-mule.el" "ps-samp.el" +;;;;;; "s-region.el" "saveplace.el" "sb-image.el" "scroll-bar.el" +;;;;;; "select.el" "soundex.el" "subdirs.el" "tempo.el" "textmodes/bib-mode.el" +;;;;;; "textmodes/makeinfo.el" "textmodes/page-ext.el" "textmodes/refbib.el" +;;;;;; "textmodes/refer.el" "textmodes/reftex-auc.el" "textmodes/reftex-dcr.el" +;;;;;; "textmodes/reftex-ref.el" "textmodes/reftex-sel.el" "textmodes/reftex-toc.el" +;;;;;; "textmodes/texnfo-upd.el" "timezone.el" "tooltip.el" "tree-widget.el" +;;;;;; "uniquify.el" "url/url-about.el" "url/url-cookie.el" "url/url-dired.el" +;;;;;; "url/url-expand.el" "url/url-ftp.el" "url/url-history.el" +;;;;;; "url/url-imap.el" "url/url-methods.el" "url/url-nfs.el" "url/url-proxy.el" +;;;;;; "url/url-vars.el" "vc-dav.el" "vcursor.el" "vt-control.el" +;;;;;; "vt100-led.el" "w32-fns.el" "w32-vars.el" "x-dnd.el") (19382 +;;;;;; 35538 347447)) +>>>>>>> MERGE-SOURCE ;;;*** |