Using saved parent location: http://bzr.savannah.gnu.org/r/emacs/trunk/ Now on revision 101908. ------------------------------------------------------------ revno: 101908 committer: Chong Yidong branch nick: trunk timestamp: Mon 2010-10-11 00:49:59 -0400 message: More cleanups and minor fixes for Customize. * cus-edit.el (custom-face-edit-fix-value): Use custom-fix-face-spec. * custom.el (custom-push-theme): Cleanup (use cond). (disable-theme): Recompute the saved-face property. (custom-theme-recalc-face): Follow face alias before setting prop. * custom.el (custom-fix-face-spec): New function; code moved from custom-face-edit-fix-value. (custom-push-theme): Use it when checking if a face has been changed outside customize. (custom-available-themes): New function. (load-theme): Use it. * image.el (image-checkbox-checked, image-checkbox-unchecked): New variables, containing checkbox images. * startup.el (fancy-startup-tail): * wid-edit.el (checkbox): Use them. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-10 23:12:30 +0000 +++ lisp/ChangeLog 2010-10-11 04:49:59 +0000 @@ -1,3 +1,25 @@ +2010-10-11 Chong Yidong + + * custom.el (custom-fix-face-spec): New function; code moved from + custom-face-edit-fix-value. + (custom-push-theme): Use it when checking if a face has been + changed outside customize. + (custom-available-themes): New function. + (load-theme): Use it. + + * cus-edit.el (custom-face-edit-fix-value): Use + custom-fix-face-spec. + + * custom.el (custom-push-theme): Cleanup (use cond). + (disable-theme): Recompute the saved-face property. + (custom-theme-recalc-face): Follow face alias before setting prop. + + * image.el (image-checkbox-checked, image-checkbox-unchecked): New + variables, containing checkbox images. + + * startup.el (fancy-startup-tail): + * wid-edit.el (checkbox): Use them. + 2010-10-10 Dan Nicolaescu * shell.el (shell-mode-map): === modified file 'lisp/cus-edit.el' --- lisp/cus-edit.el 2010-10-09 21:54:20 +0000 +++ lisp/cus-edit.el 2010-10-11 04:49:59 +0000 @@ -3102,27 +3102,7 @@ (defun custom-face-edit-fix-value (widget value) "Ignoring WIDGET, convert :bold and :italic in VALUE to new form. Also change :reverse-video to :inverse-video." - (if (listp value) - (let (result) - (while value - (let ((key (car value)) - (val (car (cdr value)))) - (cond ((eq key :italic) - (push :slant result) - (push (if val 'italic 'normal) result)) - ((eq key :bold) - (push :weight result) - (push (if val 'bold 'normal) result)) - ((eq key :reverse-video) - (push :inverse-video result) - (push val result)) - (t - (push key result) - (push val result)))) - (setq value (cdr (cdr value)))) - (setq result (nreverse result)) - result) - value)) + (custom-fix-face-spec value)) (defun custom-face-edit-convert-widget (widget) "Convert :args as widget types in WIDGET." === modified file 'lisp/custom.el' --- lisp/custom.el 2010-08-29 16:17:13 +0000 +++ lisp/custom.el 2010-10-11 04:49:59 +0000 @@ -819,48 +819,80 @@ (setting (assq theme old)) ; '(theme value) (theme-settings ; '(prop symbol theme value) (get theme 'theme-settings))) - (if (eq mode 'reset) - ;; Remove a setting. - (when setting - (let (res) - (dolist (theme-setting theme-settings) - (if (and (eq (car theme-setting) prop) - (eq (cadr theme-setting) symbol)) - (setq res theme-setting))) - (put theme 'theme-settings (delq res theme-settings))) - (put symbol prop (delq setting old))) - (if setting - ;; Alter an existing setting. - (let (res) - (dolist (theme-setting theme-settings) - (if (and (eq (car theme-setting) prop) - (eq (cadr theme-setting) symbol)) - (setq res theme-setting))) - (put theme 'theme-settings - (cons (list prop symbol theme value) - (delq res theme-settings))) - (setcar (cdr setting) value)) - ;; Add a new setting. + (cond + ;; Remove a setting: + ((eq mode 'reset) + (when setting + (let (res) + (dolist (theme-setting theme-settings) + (if (and (eq (car theme-setting) prop) + (eq (cadr theme-setting) symbol)) + (setq res theme-setting))) + (put theme 'theme-settings (delq res theme-settings))) + (put symbol prop (delq setting old)))) + ;; Alter an existing setting: + (setting + (let (res) + (dolist (theme-setting theme-settings) + (if (and (eq (car theme-setting) prop) + (eq (cadr theme-setting) symbol)) + (setq res theme-setting))) + (put theme 'theme-settings + (cons (list prop symbol theme value) + (delq res theme-settings))) + (setcar (cdr setting) value))) + ;; Add a new setting: + (t + (unless old ;; If the user changed the value outside of Customize, we ;; first save the current value to a fake theme, `changed'. ;; This ensures that the user-set value comes back if the ;; theme is later disabled. - (if (null old) - (if (and (eq prop 'theme-value) - (boundp symbol)) - (let ((sv (get symbol 'standard-value))) - (unless (and sv - (equal (eval (car sv)) (symbol-value symbol))) - (setq old (list (list 'changed (symbol-value symbol)))))) - (if (and (facep symbol) - (not (face-spec-match-p symbol (get symbol 'face-defface-spec)))) - (setq old (list (list 'changed (list - (append '(t) (custom-face-attributes-get symbol nil))))))))) - (put symbol prop (cons (list theme value) old)) - (put theme 'theme-settings - (cons (list prop symbol theme value) - theme-settings)))))) + (cond ((and (eq prop 'theme-value) + (boundp symbol)) + (let ((sv (get symbol 'standard-value))) + (unless (and sv + (equal (eval (car sv)) (symbol-value symbol))) + (setq old (list (list 'changed (symbol-value symbol))))))) + ((and (facep symbol) + (not (face-attr-match-p + symbol + (custom-fix-face-spec + (face-spec-choose + (get symbol 'face-defface-spec)))))) + (setq old `((changed + (,(append '(t) (custom-face-attributes-get + symbol nil))))))))) + (put symbol prop (cons (list theme value) old)) + (put theme 'theme-settings + (cons (list prop symbol theme value) theme-settings)))))) +(defun custom-fix-face-spec (spec) + "Convert face SPEC, replacing obsolete :bold and :italic attributes. +Also change :reverse-video to :inverse-video." + (when (listp spec) + (if (or (memq :bold spec) + (memq :italic spec) + (memq :inverse-video spec)) + (let (result) + (while spec + (let ((key (car spec)) + (val (car (cdr spec)))) + (cond ((eq key :italic) + (push :slant result) + (push (if val 'italic 'normal) result)) + ((eq key :bold) + (push :weight result) + (push (if val 'bold 'normal) result)) + ((eq key :reverse-video) + (push :inverse-video result) + (push val result)) + (t + (push key result) + (push val result)))) + (setq spec (cddr spec))) + (nreverse result)) + spec))) (defun custom-set-variables (&rest args) "Install user customizations of variable values specified in ARGS. @@ -895,7 +927,7 @@ EXP itself is saved unevaluated as SYMBOL property `saved-value' and in SYMBOL's list property `theme-value' \(using `custom-push-theme')." (custom-check-theme theme) - + ;; Process all the needed autoloads before anything else, so that the ;; subsequent code has all the info it needs (e.g. which var corresponds ;; to a minor mode), regardless of the ordering of the variables. @@ -1062,7 +1094,10 @@ This also enables the theme; use `disable-theme' to disable it." ;; Note we do no check for validity of the theme here. ;; This allows to pull in themes by a file-name convention - (interactive "SCustom theme name: ") + (interactive + (list + (intern (completing-read "Load custom theme: " + (mapcar 'symbol-name (custom-available-themes)))))) ;; If reloading, clear out the old theme settings. (when (custom-theme-p theme) (disable-theme theme) @@ -1073,6 +1108,21 @@ (cons custom-theme-directory load-path) load-path))) (load (symbol-name (custom-make-theme-feature theme))))) + +(defun custom-available-themes () + (let* ((load-path (if (file-directory-p custom-theme-directory) + (cons custom-theme-directory load-path) + load-path)) + sym themes) + (dolist (dir load-path) + (dolist (file (file-expand-wildcards + (expand-file-name "*-theme.el" dir) t)) + (setq file (file-name-nondirectory file)) + (and (string-match "\\`\\(.+\\)-theme.el\\'" file) + (setq sym (intern (match-string 1 file))) + (not (memq sym '(cus user changed color))) + (push sym themes)))) + (delete-dups themes))) ;;; Enabling and disabling loaded themes. @@ -1085,7 +1135,10 @@ If THEME does not specify any theme settings, this tries to load the theme from its theme file, by calling `load-theme'." - (interactive "SEnable Custom theme: ") + (interactive (list (intern + (completing-read + "Enable custom theme: " + obarray (lambda (sym) (get sym 'theme-settings)))))) (if (not (custom-theme-p theme)) (load-theme theme) ;; This could use a bit of optimization -- cyd @@ -1143,21 +1196,28 @@ See `custom-enabled-themes' for a list of enabled themes." (interactive (list (intern (completing-read - "Disable Custom theme: " + "Disable custom theme: " (mapcar 'symbol-name custom-enabled-themes) nil t)))) (when (custom-theme-enabled-p theme) (let ((settings (get theme 'theme-settings))) (dolist (s settings) - (let* ((prop (car s)) + (let* ((prop (car s)) (symbol (cadr s)) - (spec-list (get symbol prop))) - (put symbol prop (assq-delete-all theme spec-list)) - (if (eq prop 'theme-value) - (custom-theme-recalc-variable symbol) + (val (assq-delete-all theme (get symbol prop)))) + (put symbol prop val) + (cond + ((eq prop 'theme-value) + (custom-theme-recalc-variable symbol)) + ((eq prop 'theme-face) + ;; If the face spec specified by this theme is in the + ;; saved-face property, reset that property. + (when (equal (nth 3 s) (get symbol 'saved-face)) + (put symbol 'saved-face + (and val (cadr (car val))))) (custom-theme-recalc-face symbol))))) - (setq custom-enabled-themes - (delq theme custom-enabled-themes)))) + (setq custom-enabled-themes + (delq theme custom-enabled-themes))))) (defun custom-variable-theme-value (variable) "Return (list VALUE) indicating the custom theme value of VARIABLE. @@ -1183,10 +1243,10 @@ (defun custom-theme-recalc-face (face) "Set FACE according to currently enabled custom themes." - (if (facep face) - (face-spec-set face - (get (or (get face 'face-alias) face) - 'face-override-spec)))) + (if (get face 'face-alias) + (setq face (get face 'face-alias))) + (face-spec-set face (get face 'face-override-spec))) + ;;; XEmacs compability functions === modified file 'lisp/image.el' --- lisp/image.el 2010-09-09 02:25:12 +0000 +++ lisp/image.el 2010-10-11 04:49:59 +0000 @@ -721,7 +721,20 @@ (cons (concat "\\." extension "\\'") 'imagemagick) image-type-file-name-regexps))))) - + +;;; Inline stock images + +(defvar image-checkbox-checked + (create-image "\300\300\141\143\067\076\034\030" + 'xbm t :width 8 :height 8 :background "grey75" + :foreground "black" :relief -2 :ascent 'center) + "Image of a checked checkbox.") + +(defvar image-checkbox-unchecked + (create-image (make-string 8 0) + 'xbm t :width 8 :height 8 :background "grey75" + :foreground "black" :relief -2 :ascent 'center) + "Image of an unchecked checkbox.") (provide 'image) === modified file 'lisp/startup.el' --- lisp/startup.el 2010-08-29 16:17:13 +0000 +++ lisp/startup.el 2010-10-11 04:49:59 +0000 @@ -1563,23 +1563,21 @@ (kill-buffer "*GNU Emacs*"))) " ") (when (or user-init-file custom-file) - (let ((checked (create-image "\300\300\141\143\067\076\034\030" - 'xbm t :width 8 :height 8 :background "grey75" - :foreground "black" :relief -2 :ascent 'center)) - (unchecked (create-image (make-string 8 0) - 'xbm t :width 8 :height 8 :background "grey75" - :foreground "black" :relief -2 :ascent 'center))) - (insert-button - " " :on-glyph checked :off-glyph unchecked 'checked nil - 'display unchecked 'follow-link t - 'action (lambda (button) - (if (overlay-get button 'checked) - (progn (overlay-put button 'checked nil) - (overlay-put button 'display (overlay-get button :off-glyph)) - (setq startup-screen-inhibit-startup-screen nil)) - (overlay-put button 'checked t) - (overlay-put button 'display (overlay-get button :on-glyph)) - (setq startup-screen-inhibit-startup-screen t))))) + (insert-button + " " + :on-glyph image-checkbox-checked + :off-glyph image-checkbox-unchecked + 'checked nil 'display image-checkbox-unchecked 'follow-link t + 'action (lambda (button) + (if (overlay-get button 'checked) + (progn (overlay-put button 'checked nil) + (overlay-put button 'display + (overlay-get button :off-glyph)) + (setq startup-screen-inhibit-startup-screen nil)) + (overlay-put button 'checked t) + (overlay-put button 'display + (overlay-get button :on-glyph)) + (setq startup-screen-inhibit-startup-screen t)))) (fancy-splash-insert :face '(variable-pitch (:height 0.9)) " Never show it again."))))) === modified file 'lisp/wid-edit.el' --- lisp/wid-edit.el 2010-10-09 03:23:38 +0000 +++ lisp/wid-edit.el 2010-10-11 04:49:59 +0000 @@ -2195,19 +2195,9 @@ ;; We could probably do the same job as the images using single ;; space characters in a boxed face with a stretch specification to ;; make them square. - :on-glyph '(create-image "\300\300\141\143\067\076\034\030" - 'xbm t :width 8 :height 8 - :background "grey75" ; like default mode line - :foreground "black" - :relief -2 - :ascent 'center) + :on-glyph image-checkbox-checked :off "[ ]" - :off-glyph '(create-image (make-string 8 0) - 'xbm t :width 8 :height 8 - :background "grey75" - :foreground "black" - :relief -2 - :ascent 'center) + :off-glyph image-checkbox-unchecked :help-echo "Toggle this item." :action 'widget-checkbox-action) ------------------------------------------------------------ revno: 101907 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-10 18:57:48 -0700 message: Add explicit -I$srcdir to makeinfo in some doc/ Makefiles. * doc/emacs/Makefile.in (MAKEINFO): Add explicit -I$srcdir. * doc/lispintro/Makefile.in (MAKEINFO): Add explicit -I$srcdir. * doc/lispref/Makefile.in (MAKEINFO): Add explicit -I$srcdir. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2010-10-11 00:43:27 +0000 +++ doc/emacs/ChangeLog 2010-10-11 01:57:48 +0000 @@ -1,5 +1,7 @@ 2010-10-11 Glenn Morris + * Makefile.in (MAKEINFO): Add explicit -I$srcdir. + * Makefile.in (.texi.dvi): Remove unnecessary suffix rule. (DVIPS): New variable. (.PHONY): Add html, ps. === modified file 'doc/emacs/Makefile.in' --- doc/emacs/Makefile.in 2010-10-11 00:43:27 +0000 +++ doc/emacs/Makefile.in 2010-10-11 01:57:48 +0000 @@ -39,7 +39,7 @@ # The makeinfo program is part of the Texinfo distribution. # Use --force so that it generates output even if there are errors. -MAKEINFO = makeinfo --force +MAKEINFO = makeinfo --force -I $(srcdir) TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf @@ -129,7 +129,7 @@ $(infodir)/emacs: ${EMACSSOURCES} $(mkinfodir) - $(MAKEINFO) $< -o $@ + $(MAKEINFO) -o $@ $< emacs.dvi: ${EMACSSOURCES} $(ENVADD) $(TEXI2DVI) $< === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2010-10-11 00:43:27 +0000 +++ doc/lispintro/ChangeLog 2010-10-11 01:57:48 +0000 @@ -5,6 +5,7 @@ (ps, emacs-lisp-intro.ps): New targets. (clean): Delete ps file. (MAKEINFO): Use --force like the other doc/ Makefiles do. + Add explicit -I$srcdir. 2010-10-09 Glenn Morris === modified file 'doc/lispintro/Makefile.in' --- doc/lispintro/Makefile.in 2010-10-11 00:43:27 +0000 +++ doc/lispintro/Makefile.in 2010-10-11 01:57:48 +0000 @@ -28,7 +28,7 @@ # Directory with the (customized) texinfo.tex file. texinfodir = $(srcdir)/../misc -MAKEINFO = makeinfo --force +MAKEINFO = makeinfo --force -I $(srcdir) TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2010-10-11 00:43:27 +0000 +++ doc/lispref/ChangeLog 2010-10-11 01:57:48 +0000 @@ -1,5 +1,7 @@ 2010-10-11 Glenn Morris + * Makefile.in (MAKEINFO): Add explicit -I$srcdir. + * Makefile.in (DVIPS): New variable. (.PHONY): Add html, ps. (html, elisp.html, ps, elisp.ps): New targets. === modified file 'doc/lispref/Makefile.in' --- doc/lispref/Makefile.in 2010-10-11 00:43:27 +0000 +++ doc/lispref/Makefile.in 2010-10-11 01:57:48 +0000 @@ -32,7 +32,7 @@ # Directory with emacsver.texi. emacsdir = $(srcdir)/../emacs -MAKEINFO = makeinfo --force -I $(emacsdir) +MAKEINFO = makeinfo --force -I $(emacsdir) -I $(srcdir) TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips ------------------------------------------------------------ revno: 101906 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-10 17:43:27 -0700 message: Add html targets for some doc/ Makefiles. * doc/lispref/Makefile.in (.PHONY): Add html. (html, elisp.html): New targets. (clean): Delete html files. ($(infodir)/elisp): Remove unnecessary includes. * doc/lispintro/Makefile.in (MAKEINFO): Use --force like the other doc/ Makefiles do. * doc/emacs/Makefile.in (.PHONY): Add html. (html, emacs.html): New targets. (clean): Delete html files. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2010-10-11 00:30:34 +0000 +++ doc/emacs/ChangeLog 2010-10-11 00:43:27 +0000 @@ -2,9 +2,9 @@ * Makefile.in (.texi.dvi): Remove unnecessary suffix rule. (DVIPS): New variable. - (.PHONY): Add ps. - (ps, emacs.ps, emacs-xtra.ps): New targets. - (clean): Delete ps files. + (.PHONY): Add html, ps. + (html, emacs.html, ps, emacs.ps, emacs-xtra.ps): New targets. + (clean): Delete html, ps files. 2010-10-09 Eli Zaretskii === modified file 'doc/emacs/Makefile.in' --- doc/emacs/Makefile.in 2010-10-11 00:30:34 +0000 +++ doc/emacs/Makefile.in 2010-10-11 00:43:27 +0000 @@ -115,10 +115,11 @@ ## solution anyway. The second test -d is for parallel builds. mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir} -.PHONY: info dvi pdf ps +.PHONY: info dvi html pdf ps info: $(infodir)/emacs dvi: emacs.dvi +html: emacs.html pdf: emacs.pdf ps: emacs.ps @@ -139,6 +140,8 @@ emacs.pdf: ${EMACSSOURCES} $(ENVADD) $(TEXI2PDF) $< +emacs.html: ${EMACSSOURCES} + $(MAKEINFO) --html -o $@ $< emacs-xtra.dvi: $(EMACS_XTRA) $(ENVADD) $(TEXI2DVI) $< @@ -160,6 +163,7 @@ clean: mostlyclean rm -f emacs.dvi emacs-xtra.dvi emacs.pdf emacs-xtra.pdf \ emacs.ps emacs-xtra.ps + rm -rf emacs.html/ rm -f emacs-manual-${version}.tar* distclean: clean === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2010-10-11 00:30:34 +0000 +++ doc/lispintro/ChangeLog 2010-10-11 00:43:27 +0000 @@ -4,6 +4,7 @@ (.PHONY): Add ps. (ps, emacs-lisp-intro.ps): New targets. (clean): Delete ps file. + (MAKEINFO): Use --force like the other doc/ Makefiles do. 2010-10-09 Glenn Morris === modified file 'doc/lispintro/Makefile.in' --- doc/lispintro/Makefile.in 2010-10-11 00:30:34 +0000 +++ doc/lispintro/Makefile.in 2010-10-11 00:43:27 +0000 @@ -28,7 +28,7 @@ # Directory with the (customized) texinfo.tex file. texinfodir = $(srcdir)/../misc -MAKEINFO = makeinfo +MAKEINFO = makeinfo --force TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf DVIPS = dvips @@ -48,7 +48,7 @@ # -NN extensions to fit into DOS 8+3 limits without clashing. ${infodir}/eintr: ${srcdir}/emacs-lisp-intro.texi $(mkinfodir) - $(MAKEINFO) $< -o $@ + $(MAKEINFO) -o $@ $< emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $< === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2010-10-11 00:30:34 +0000 +++ doc/lispref/ChangeLog 2010-10-11 00:43:27 +0000 @@ -1,9 +1,10 @@ 2010-10-11 Glenn Morris * Makefile.in (DVIPS): New variable. - (.PHONY): Add ps. - (ps, elisp.ps): New targets. - (clean): Delete ps file. + (.PHONY): Add html, ps. + (html, elisp.html, ps, elisp.ps): New targets. + (clean): Delete html, ps files. + ($(infodir)/elisp): Remove unnecessary includes. 2010-10-09 Eli Zaretskii === modified file 'doc/lispref/Makefile.in' --- doc/lispref/Makefile.in 2010-10-11 00:30:34 +0000 +++ doc/lispref/Makefile.in 2010-10-11 00:43:27 +0000 @@ -100,16 +100,20 @@ info: $(infodir)/elisp dvi: elisp.dvi +html: elisp.html pdf: elisp.pdf ps: elisp.ps $(infodir)/elisp: $(srcs) $(mkinfodir) - $(MAKEINFO) -I. -I$(texinfodir) $< -o $@ + $(MAKEINFO) -o $@ $< elisp.dvi: $(srcs) $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $< +elisp.html: $(srcs) + $(MAKEINFO) --html -o $@ $< + elisp.ps: elisp.dvi $(DVIPS) -o $@ $< @@ -126,6 +130,7 @@ clean: mostlyclean rm -f elisp.dvi elisp.pdf elisp.ps vol[12].pdf + rm -rf elisp.html rm -f emacs-lispref-${version}.tar* distclean: clean ------------------------------------------------------------ revno: 101905 committer: Glenn Morris branch nick: trunk timestamp: Sun 2010-10-10 17:30:34 -0700 message: Add ps rules for some doc/ Makefiles. * doc/misc/Makefile.in (.texi.dvi): Remove unnecessary suffix rule. * dos/lispref/Makefile.in (DVIPS): New variable. (.PHONY): Add ps. (ps, elisp.ps): New targets. (clean): Delete ps file. * doc/lispintro/Makefile.in (.dvi.ps): Remove unnecessary suffix rule. (.PHONY): Add ps. (ps, emacs-lisp-intro.ps): New targets. (clean): Delete ps file. * doc/emacs/Makefile.in (.texi.dvi): Remove unnecessary suffix rule. (DVIPS): New variable. (.PHONY): Add ps. (ps, emacs.ps, emacs-xtra.ps): New targets. (clean): Delete ps files. diff: === modified file 'doc/emacs/ChangeLog' --- doc/emacs/ChangeLog 2010-10-09 21:38:04 +0000 +++ doc/emacs/ChangeLog 2010-10-11 00:30:34 +0000 @@ -1,3 +1,11 @@ +2010-10-11 Glenn Morris + + * Makefile.in (.texi.dvi): Remove unnecessary suffix rule. + (DVIPS): New variable. + (.PHONY): Add ps. + (ps, emacs.ps, emacs-xtra.ps): New targets. + (clean): Delete ps files. + 2010-10-09 Eli Zaretskii * makefile.w32-in (EMACSSOURCES): Add emacsver.texi. === modified file 'doc/emacs/Makefile.in' --- doc/emacs/Makefile.in 2010-10-09 21:19:09 +0000 +++ doc/emacs/Makefile.in 2010-10-11 00:30:34 +0000 @@ -43,11 +43,8 @@ TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf +DVIPS = dvips -# The following rule does not work with all versions of `make'. -.SUFFIXES: .texi .dvi -.texi.dvi: - $(TEXI2DVI) $< ENVADD = TEXINPUTS="$(srcdir):$(texinfodir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)" @@ -118,11 +115,12 @@ ## solution anyway. The second test -d is for parallel builds. mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir} -.PHONY: info dvi pdf +.PHONY: info dvi pdf ps info: $(infodir)/emacs dvi: emacs.dvi pdf: emacs.pdf +ps: emacs.ps # Note that all the Info targets build the Info files in srcdir. # There is no provision for Info files to exist in the build directory. @@ -135,6 +133,9 @@ emacs.dvi: ${EMACSSOURCES} $(ENVADD) $(TEXI2DVI) $< +emacs.ps: emacs.dvi + $(DVIPS) -o $@ $< + emacs.pdf: ${EMACSSOURCES} $(ENVADD) $(TEXI2PDF) $< @@ -142,6 +143,9 @@ emacs-xtra.dvi: $(EMACS_XTRA) $(ENVADD) $(TEXI2DVI) $< +emacs-xtra.ps: emacs-xtra.dvi + $(DVIPS) -o $@ $< + emacs-xtra.pdf: $(EMACS_XTRA) $(ENVADD) $(TEXI2PDF) $< @@ -154,7 +158,8 @@ ## Products not in the release tarfiles. clean: mostlyclean - rm -f emacs.dvi emacs-xtra.dvi emacs.pdf emacs-xtra.pdf + rm -f emacs.dvi emacs-xtra.dvi emacs.pdf emacs-xtra.pdf \ + emacs.ps emacs-xtra.ps rm -f emacs-manual-${version}.tar* distclean: clean === modified file 'doc/lispintro/ChangeLog' --- doc/lispintro/ChangeLog 2010-10-09 21:19:09 +0000 +++ doc/lispintro/ChangeLog 2010-10-11 00:30:34 +0000 @@ -1,3 +1,10 @@ +2010-10-11 Glenn Morris + + * Makefile.in (.dvi.ps): Remove unnecessary suffix rule. + (.PHONY): Add ps. + (ps, emacs-lisp-intro.ps): New targets. + (clean): Delete ps file. + 2010-10-09 Glenn Morris * Makefile.in (VPATH): Remove. === modified file 'doc/lispintro/Makefile.in' --- doc/lispintro/Makefile.in 2010-10-09 21:19:09 +0000 +++ doc/lispintro/Makefile.in 2010-10-11 00:30:34 +0000 @@ -35,15 +35,14 @@ mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir} -.SUFFIXES: .dvi .ps .texi - -.PHONY: info dvi html pdf +.PHONY: info dvi html pdf ps info: ${infodir}/eintr dvi: emacs-lisp-intro.dvi html: emacs-lisp-intro.html pdf: emacs-lisp-intro.pdf +ps: emacs-lisp-intro.ps # The file name eintr must fit within 5 characters, to allow for # -NN extensions to fit into DOS 8+3 limits without clashing. @@ -54,15 +53,15 @@ emacs-lisp-intro.dvi: ${srcdir}/emacs-lisp-intro.texi $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $< +emacs-lisp-intro.ps: emacs-lisp-intro.dvi + $(DVIPS) -o $@ $< + emacs-lisp-intro.pdf: ${srcdir}/emacs-lisp-intro.texi $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $< emacs-lisp-intro.html: ${srcdir}/emacs-lisp-intro.texi $(MAKEINFO) --html -o $@ $< -.dvi.ps: - $(DVIPS) $< -o $@ - .PHONY: mostlyclean clean distclean maintainer-clean infoclean mostlyclean: @@ -70,7 +69,7 @@ *.op *.ops *.pg *.pgs *.tp *.tps *.vr *.vrs clean: mostlyclean - rm -f emacs-lisp-intro.dvi emacs-lisp-intro.pdf + rm -f emacs-lisp-intro.dvi emacs-lisp-intro.pdf emacs-lisp-intro.ps rm -rf emacs-lisp-intro.html/ rm -f emacs-lispintro-${version}.tar* === modified file 'doc/lispref/ChangeLog' --- doc/lispref/ChangeLog 2010-10-09 21:38:04 +0000 +++ doc/lispref/ChangeLog 2010-10-11 00:30:34 +0000 @@ -1,3 +1,10 @@ +2010-10-11 Glenn Morris + + * Makefile.in (DVIPS): New variable. + (.PHONY): Add ps. + (ps, elisp.ps): New targets. + (clean): Delete ps file. + 2010-10-09 Eli Zaretskii * makefile.w32-in (emacsdir): New variable. === modified file 'doc/lispref/Makefile.in' --- doc/lispref/Makefile.in 2010-10-09 21:19:09 +0000 +++ doc/lispref/Makefile.in 2010-10-11 00:30:34 +0000 @@ -35,6 +35,7 @@ MAKEINFO = makeinfo --force -I $(emacsdir) TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf +DVIPS = dvips # List of all the texinfo files in the manual: @@ -95,12 +96,12 @@ mkinfodir = @test -d ${infodir} || mkdir ${infodir} || test -d ${infodir} -.PHONY: info dvi pdf +.PHONY: info dvi pdf ps -# The info file is named `elisp'. info: $(infodir)/elisp dvi: elisp.dvi pdf: elisp.pdf +ps: elisp.ps $(infodir)/elisp: $(srcs) $(mkinfodir) @@ -109,6 +110,9 @@ elisp.dvi: $(srcs) $(TEXI2DVI) -I $(srcdir) -I $(texinfodir) $< +elisp.ps: elisp.dvi + $(DVIPS) -o $@ $< + elisp.pdf: $(srcs) $(TEXI2PDF) -I $(srcdir) -I $(texinfodir) $< @@ -121,7 +125,7 @@ rm -f elisp[12]* clean: mostlyclean - rm -f elisp.dvi elisp.pdf vol[12].pdf + rm -f elisp.dvi elisp.pdf elisp.ps vol[12].pdf rm -f emacs-lispref-${version}.tar* distclean: clean === modified file 'doc/misc/ChangeLog' --- doc/misc/ChangeLog 2010-10-10 00:15:21 +0000 +++ doc/misc/ChangeLog 2010-10-11 00:30:34 +0000 @@ -1,3 +1,7 @@ +2010-10-11 Glenn Morris + + * Makefile.in (.texi.dvi): Remove unnecessary suffix rule. + 2010-10-09 Lars Magne Ingebrigtsen * gnus.texi (Spam Package Introduction): Mention `$'. === modified file 'doc/misc/Makefile.in' --- doc/misc/Makefile.in 2010-10-09 22:40:30 +0000 +++ doc/misc/Makefile.in 2010-10-11 00:30:34 +0000 @@ -198,11 +198,6 @@ TEXI2DVI = texi2dvi TEXI2PDF = texi2pdf -# The following rule does not work with all versions of `make'. -.SUFFIXES: .texi .dvi -.texi.dvi: - $(TEXI2DVI) $< - ENVADD = TEXINPUTS="$(srcdir):$(TEXINPUTS)" MAKEINFO="$(MAKEINFO) -I$(srcdir)" mkinfodir = @cd ${srcdir}; test -d ${infodir} || mkdir ${infodir} || test -d ${infodir} ------------------------------------------------------------ revno: 101904 committer: Dan Nicolaescu branch nick: trunk timestamp: Sun 2010-10-10 16:13:58 -0700 message: * lisp/erc/erc-list.el (erc-list-menu-mode-map): Declare and define in one step. diff: === modified file 'lisp/erc/ChangeLog' --- lisp/erc/ChangeLog 2010-08-14 22:58:10 +0000 +++ lisp/erc/ChangeLog 2010-10-10 23:13:58 +0000 @@ -1,3 +1,7 @@ +2010-10-10 Dan Nicolaescu + + * erc-list.el (erc-list-menu-mode-map): Declare and define in one step. + 2010-08-14 Vivek Dasmohapatra * erc-join.el (erc-autojoin-timing, erc-autojoin-delay): New vars. ------------------------------------------------------------ revno: 101903 committer: Dan Nicolaescu branch nick: trunk timestamp: Sun 2010-10-10 16:12:30 -0700 message: Declare and define in one step various mode maps. * lisp/shell.el (shell-mode-map): * lisp/progmodes/modula2.el (m2-mode-map): * lisp/progmodes/inf-lisp.el (inferior-lisp-mode-map): * lisp/play/mpuz.el (mpuz-mode-map): * lisp/play/landmark.el (lm-mode-map): * lisp/play/decipher.el (decipher-mode-map): * lisp/play/5x5.el (5x5-mode-map): * lisp/net/telnet.el (telnet-mode-map): * lisp/net/quickurl.el (quickurl-list-mode-map): * lisp/net/mairix.el (mairix-searches-mode-map): * lisp/net/eudc-hotlist.el (eudc-hotlist-mode-map): * lisp/net/dig.el (dig-mode-map): * lisp/mail/mspools.el (mspools-mode-map): * lisp/hexl.el (hexl-mode-map): * lisp/emulation/ws-mode.el (wordstar-C-k-map, wordstar-mode-map) (wordstar-C-o-map, wordstar-C-q-map): * lisp/emacs-lisp/edebug.el (edebug-eval-mode-map): * lisp/emacs-lisp/chart.el (chart-map): * lisp/edmacro.el (edmacro-mode-map): * lisp/array.el (array-mode-map): Declare and define in one step. * lisp/erc/erc-list.el (erc-list-menu-mode-map): Declare and define in one step. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-10 03:40:58 +0000 +++ lisp/ChangeLog 2010-10-10 23:12:30 +0000 @@ -1,5 +1,27 @@ 2010-10-10 Dan Nicolaescu + * shell.el (shell-mode-map): + * progmodes/modula2.el (m2-mode-map): + * progmodes/inf-lisp.el (inferior-lisp-mode-map): + * play/mpuz.el (mpuz-mode-map): + * play/landmark.el (lm-mode-map): + * play/decipher.el (decipher-mode-map): + * play/5x5.el (5x5-mode-map): + * net/telnet.el (telnet-mode-map): + * net/quickurl.el (quickurl-list-mode-map): + * net/mairix.el (mairix-searches-mode-map): + * net/eudc-hotlist.el (eudc-hotlist-mode-map): + * net/dig.el (dig-mode-map): + * mail/mspools.el (mspools-mode-map): + * hexl.el (hexl-mode-map): + * emulation/ws-mode.el (wordstar-C-k-map, wordstar-mode-map) + (wordstar-C-o-map, wordstar-C-q-map): + * emacs-lisp/edebug.el (edebug-eval-mode-map): + * emacs-lisp/chart.el (chart-map): + * edmacro.el (edmacro-mode-map): + * erc/erc-list.el (erc-list-menu-mode-map): + * array.el (array-mode-map): Declare and define in one step. + * vc/log-view.el (log-view-mode-map): Bind revert-buffer. 2010-10-10 Daiki Ueno === modified file 'lisp/array.el' --- lisp/array.el 2010-01-13 08:35:10 +0000 +++ lisp/array.el 2010-10-10 23:12:30 +0000 @@ -775,32 +775,30 @@ ;;; Array mode. -(defvar array-mode-map nil +(defvar array-mode-map + (let ((map (make-keymap))) + (define-key map "\M-ad" 'array-display-local-variables) + (define-key map "\M-am" 'array-make-template) + (define-key map "\M-ae" 'array-expand-rows) + (define-key map "\M-ar" 'array-reconfigure-rows) + (define-key map "\M-a=" 'array-what-position) + (define-key map "\M-ag" 'array-goto-cell) + (define-key map "\M-af" 'array-fill-rectangle) + (define-key map "\C-n" 'array-next-row) + (define-key map "\C-p" 'array-previous-row) + (define-key map "\C-f" 'array-forward-column) + (define-key map "\C-b" 'array-backward-column) + (define-key map "\M-n" 'array-copy-down) + (define-key map "\M-p" 'array-copy-up) + (define-key map "\M-f" 'array-copy-forward) + (define-key map "\M-b" 'array-copy-backward) + (define-key map "\M-\C-n" 'array-copy-row-down) + (define-key map "\M-\C-p" 'array-copy-row-up) + (define-key map "\M-\C-f" 'array-copy-column-forward) + (define-key map "\M-\C-b" 'array-copy-column-backward) + map) "Keymap used in array mode.") -(if array-mode-map - () - (setq array-mode-map (make-keymap)) - ;; Bind keys. - (define-key array-mode-map "\M-ad" 'array-display-local-variables) - (define-key array-mode-map "\M-am" 'array-make-template) - (define-key array-mode-map "\M-ae" 'array-expand-rows) - (define-key array-mode-map "\M-ar" 'array-reconfigure-rows) - (define-key array-mode-map "\M-a=" 'array-what-position) - (define-key array-mode-map "\M-ag" 'array-goto-cell) - (define-key array-mode-map "\M-af" 'array-fill-rectangle) - (define-key array-mode-map "\C-n" 'array-next-row) - (define-key array-mode-map "\C-p" 'array-previous-row) - (define-key array-mode-map "\C-f" 'array-forward-column) - (define-key array-mode-map "\C-b" 'array-backward-column) - (define-key array-mode-map "\M-n" 'array-copy-down) - (define-key array-mode-map "\M-p" 'array-copy-up) - (define-key array-mode-map "\M-f" 'array-copy-forward) - (define-key array-mode-map "\M-b" 'array-copy-backward) - (define-key array-mode-map "\M-\C-n" 'array-copy-row-down) - (define-key array-mode-map "\M-\C-p" 'array-copy-row-up) - (define-key array-mode-map "\M-\C-f" 'array-copy-column-forward) - (define-key array-mode-map "\M-\C-b" 'array-copy-column-backward)) (put 'array-mode 'mode-class 'special) === modified file 'lisp/edmacro.el' --- lisp/edmacro.el 2010-01-13 08:35:10 +0000 +++ lisp/edmacro.el 2010-10-10 23:12:30 +0000 @@ -81,11 +81,11 @@ "*Non-nil if `edit-kbd-macro' should leave 8-bit characters intact. Default nil means to write characters above \\177 in octal notation.") -(defvar edmacro-mode-map nil) -(unless edmacro-mode-map - (setq edmacro-mode-map (make-sparse-keymap)) - (define-key edmacro-mode-map "\C-c\C-c" 'edmacro-finish-edit) - (define-key edmacro-mode-map "\C-c\C-q" 'edmacro-insert-key)) +(defvar edmacro-mode-map + (let ((map (make-sparse-keymap))) + (define-key map "\C-c\C-c" 'edmacro-finish-edit) + (define-key map "\C-c\C-q" 'edmacro-insert-key) + map)) (defvar edmacro-store-hook) (defvar edmacro-finish-hook) === modified file 'lisp/emacs-lisp/chart.el' --- lisp/emacs-lisp/chart.el 2010-01-18 04:39:40 +0000 +++ lisp/emacs-lisp/chart.el 2010-10-10 23:12:30 +0000 @@ -62,11 +62,7 @@ (require 'eieio) ;;; Code: -(defvar chart-map nil "Keymap used in chart mode.") -(if chart-map - () - (setq chart-map (make-sparse-keymap)) - ) +(defvar chart-map (make-sparse-keymap) "Keymap used in chart mode.") (defvar chart-local-object nil "Local variable containing the locally displayed chart object.") === modified file 'lisp/emacs-lisp/edebug.el' --- lisp/emacs-lisp/edebug.el 2010-06-18 14:05:43 +0000 +++ lisp/emacs-lisp/edebug.el 2010-10-10 23:12:30 +0000 @@ -4011,18 +4011,16 @@ -(defvar edebug-eval-mode-map nil - "Keymap for Edebug Eval mode. Superset of Lisp Interaction mode.") - -(unless edebug-eval-mode-map - (setq edebug-eval-mode-map (make-sparse-keymap)) - (set-keymap-parent edebug-eval-mode-map lisp-interaction-mode-map) - - (define-key edebug-eval-mode-map "\C-c\C-w" 'edebug-where) - (define-key edebug-eval-mode-map "\C-c\C-d" 'edebug-delete-eval-item) - (define-key edebug-eval-mode-map "\C-c\C-u" 'edebug-update-eval-list) - (define-key edebug-eval-mode-map "\C-x\C-e" 'edebug-eval-last-sexp) - (define-key edebug-eval-mode-map "\C-j" 'edebug-eval-print-last-sexp)) +(defvar edebug-eval-mode-map + (let ((map (make-sparse-keymap))) + (set-keymap-parent map lisp-interaction-mode-map) + (define-key map "\C-c\C-w" 'edebug-where) + (define-key map "\C-c\C-d" 'edebug-delete-eval-item) + (define-key map "\C-c\C-u" 'edebug-update-eval-list) + (define-key map "\C-x\C-e" 'edebug-eval-last-sexp) + (define-key map "\C-j" 'edebug-eval-print-last-sexp) + map) +"Keymap for Edebug Eval mode. Superset of Lisp Interaction mode.") (put 'edebug-eval-mode 'mode-class 'special) === modified file 'lisp/emulation/ws-mode.el' --- lisp/emulation/ws-mode.el 2010-04-05 23:44:24 +0000 +++ lisp/emulation/ws-mode.el 2010-10-10 23:12:30 +0000 @@ -27,158 +27,156 @@ ;; This emulates WordStar, with a major mode. ;;; Code: - -(defvar wordstar-mode-map nil "") +(defvar wordstar-C-k-map + (let ((map (make-keymap))) + (define-key map " " ()) + (define-key map "0" 'ws-set-marker-0) + (define-key map "1" 'ws-set-marker-1) + (define-key map "2" 'ws-set-marker-2) + (define-key map "3" 'ws-set-marker-3) + (define-key map "4" 'ws-set-marker-4) + (define-key map "5" 'ws-set-marker-5) + (define-key map "6" 'ws-set-marker-6) + (define-key map "7" 'ws-set-marker-7) + (define-key map "8" 'ws-set-marker-8) + (define-key map "9" 'ws-set-marker-9) + (define-key map "b" 'ws-begin-block) + (define-key map "\C-b" 'ws-begin-block) + (define-key map "c" 'ws-copy-block) + (define-key map "\C-c" 'ws-copy-block) + (define-key map "d" 'save-buffers-kill-emacs) + (define-key map "\C-d" 'save-buffers-kill-emacs) + (define-key map "f" 'find-file) + (define-key map "\C-f" 'find-file) + (define-key map "h" 'ws-show-markers) + (define-key map "\C-h" 'ws-show-markers) + (define-key map "i" 'ws-indent-block) + (define-key map "\C-i" 'ws-indent-block) + (define-key map "k" 'ws-end-block) + (define-key map "\C-k" 'ws-end-block) + (define-key map "p" 'ws-print-block) + (define-key map "\C-p" 'ws-print-block) + (define-key map "q" 'kill-emacs) + (define-key map "\C-q" 'kill-emacs) + (define-key map "r" 'insert-file) + (define-key map "\C-r" 'insert-file) + (define-key map "s" 'save-some-buffers) + (define-key map "\C-s" 'save-some-buffers) + (define-key map "t" 'ws-mark-word) + (define-key map "\C-t" 'ws-mark-word) + (define-key map "u" 'ws-exdent-block) + (define-key map "\C-u" 'keyboard-quit) + (define-key map "v" 'ws-move-block) + (define-key map "\C-v" 'ws-move-block) + (define-key map "w" 'ws-write-block) + (define-key map "\C-w" 'ws-write-block) + (define-key map "x" 'save-buffers-kill-emacs) + (define-key map "\C-x" 'save-buffers-kill-emacs) + (define-key map "y" 'ws-delete-block) + (define-key map "\C-y" 'ws-delete-block) + map) + "") + +(defvar wordstar-C-o-map + (let ((map (make-keymap))) + (define-key map " " ()) + (define-key map "c" 'wordstar-center-line) + (define-key map "\C-c" 'wordstar-center-line) + (define-key map "b" 'switch-to-buffer) + (define-key map "\C-b" 'switch-to-buffer) + (define-key map "j" 'justify-current-line) + (define-key map "\C-j" 'justify-current-line) + (define-key map "k" 'kill-buffer) + (define-key map "\C-k" 'kill-buffer) + (define-key map "l" 'list-buffers) + (define-key map "\C-l" 'list-buffers) + (define-key map "m" 'auto-fill-mode) + (define-key map "\C-m" 'auto-fill-mode) + (define-key map "r" 'set-fill-column) + (define-key map "\C-r" 'set-fill-column) + (define-key map "\C-u" 'keyboard-quit) + (define-key map "wd" 'delete-other-windows) + (define-key map "wh" 'split-window-horizontally) + (define-key map "wo" 'other-window) + (define-key map "wv" 'split-window-vertically) + map) + "") + +(defvar wordstar-C-q-map + (let ((map (make-keymap))) + (define-key map " " ()) + (define-key map "0" 'ws-find-marker-0) + (define-key map "1" 'ws-find-marker-1) + (define-key map "2" 'ws-find-marker-2) + (define-key map "3" 'ws-find-marker-3) + (define-key map "4" 'ws-find-marker-4) + (define-key map "5" 'ws-find-marker-5) + (define-key map "6" 'ws-find-marker-6) + (define-key map "7" 'ws-find-marker-7) + (define-key map "8" 'ws-find-marker-8) + (define-key map "9" 'ws-find-marker-9) + (define-key map "a" 'ws-query-replace) + (define-key map "\C-a" 'ws-query-replace) + (define-key map "b" 'ws-goto-block-begin) + (define-key map "\C-b" 'ws-goto-block-begin) + (define-key map "c" 'end-of-buffer) + (define-key map "\C-c" 'end-of-buffer) + (define-key map "d" 'end-of-line) + (define-key map "\C-d" 'end-of-line) + (define-key map "f" 'ws-search) + (define-key map "\C-f" 'ws-search) + (define-key map "k" 'ws-goto-block-end) + (define-key map "\C-k" 'ws-goto-block-end) + (define-key map "l" 'ws-undo) + (define-key map "\C-l" 'ws-undo) + (define-key map "p" 'ws-last-cursorp) + (define-key map "\C-p" 'ws-last-cursorp) + (define-key map "r" 'beginning-of-buffer) + (define-key map "\C-r" 'beginning-of-buffer) + (define-key map "s" 'beginning-of-line) + (define-key map "\C-s" 'beginning-of-line) + (define-key map "\C-u" 'keyboard-quit) + (define-key map "w" 'ws-last-error) + (define-key map "\C-w" 'ws-last-error) + (define-key map "y" 'ws-kill-eol) + (define-key map "\C-y" 'ws-kill-eol) + (define-key map "\177" 'ws-kill-bol) + map) + "") + +(defvar wordstar-mode-map + (let ((map (make-keymap))) + (define-key map "\C-a" 'backward-word) + (define-key map "\C-b" 'fill-paragraph) + (define-key map "\C-c" 'scroll-up) + (define-key map "\C-d" 'forward-char) + (define-key map "\C-e" 'previous-line) + (define-key map "\C-f" 'forward-word) + (define-key map "\C-g" 'delete-char) + (define-key map "\C-h" 'backward-char) + (define-key map "\C-i" 'indent-for-tab-command) + (define-key map "\C-j" 'help-for-help) + (define-key map "\C-k" wordstar-C-k-map) + (define-key map "\C-l" 'ws-repeat-search) + (define-key map "\C-n" 'open-line) + (define-key map "\C-o" wordstar-C-o-map) + (define-key map "\C-p" 'quoted-insert) + (define-key map "\C-q" wordstar-C-q-map) + (define-key map "\C-r" 'scroll-down) + (define-key map "\C-s" 'backward-char) + (define-key map "\C-t" 'kill-word) + (define-key map "\C-u" 'keyboard-quit) + (define-key map "\C-v" 'overwrite-mode) + (define-key map "\C-w" 'scroll-down-line) + (define-key map "\C-x" 'next-line) + (define-key map "\C-y" 'kill-complete-line) + (define-key map "\C-z" 'scroll-up-line) + map) + "") + +;; wordstar-C-j-map not yet implemented (defvar wordstar-C-j-map nil "") -(defvar wordstar-C-k-map nil "") -(defvar wordstar-C-o-map nil "") -(defvar wordstar-C-q-map nil "") - -(if wordstar-mode-map - () - (setq wordstar-mode-map (make-keymap)) - ;; (setq wordstar-C-j-map (make-keymap)) ; later, perhaps - (setq wordstar-C-k-map (make-keymap)) - (setq wordstar-C-o-map (make-keymap)) - (setq wordstar-C-q-map (make-keymap)) - - (define-key wordstar-mode-map "\C-a" 'backward-word) - (define-key wordstar-mode-map "\C-b" 'fill-paragraph) - (define-key wordstar-mode-map "\C-c" 'scroll-up) - (define-key wordstar-mode-map "\C-d" 'forward-char) - (define-key wordstar-mode-map "\C-e" 'previous-line) - (define-key wordstar-mode-map "\C-f" 'forward-word) - (define-key wordstar-mode-map "\C-g" 'delete-char) - (define-key wordstar-mode-map "\C-h" 'backward-char) - (define-key wordstar-mode-map "\C-i" 'indent-for-tab-command) - (define-key wordstar-mode-map "\C-j" 'help-for-help) - (define-key wordstar-mode-map "\C-k" wordstar-C-k-map) - (define-key wordstar-mode-map "\C-l" 'ws-repeat-search) - (define-key wordstar-mode-map "\C-n" 'open-line) - (define-key wordstar-mode-map "\C-o" wordstar-C-o-map) - (define-key wordstar-mode-map "\C-p" 'quoted-insert) - (define-key wordstar-mode-map "\C-q" wordstar-C-q-map) - (define-key wordstar-mode-map "\C-r" 'scroll-down) - (define-key wordstar-mode-map "\C-s" 'backward-char) - (define-key wordstar-mode-map "\C-t" 'kill-word) - (define-key wordstar-mode-map "\C-u" 'keyboard-quit) - (define-key wordstar-mode-map "\C-v" 'overwrite-mode) - (define-key wordstar-mode-map "\C-w" 'scroll-down-line) - (define-key wordstar-mode-map "\C-x" 'next-line) - (define-key wordstar-mode-map "\C-y" 'kill-complete-line) - (define-key wordstar-mode-map "\C-z" 'scroll-up-line) - - ;; wordstar-C-k-map - - (define-key wordstar-C-k-map " " ()) - (define-key wordstar-C-k-map "0" 'ws-set-marker-0) - (define-key wordstar-C-k-map "1" 'ws-set-marker-1) - (define-key wordstar-C-k-map "2" 'ws-set-marker-2) - (define-key wordstar-C-k-map "3" 'ws-set-marker-3) - (define-key wordstar-C-k-map "4" 'ws-set-marker-4) - (define-key wordstar-C-k-map "5" 'ws-set-marker-5) - (define-key wordstar-C-k-map "6" 'ws-set-marker-6) - (define-key wordstar-C-k-map "7" 'ws-set-marker-7) - (define-key wordstar-C-k-map "8" 'ws-set-marker-8) - (define-key wordstar-C-k-map "9" 'ws-set-marker-9) - (define-key wordstar-C-k-map "b" 'ws-begin-block) - (define-key wordstar-C-k-map "\C-b" 'ws-begin-block) - (define-key wordstar-C-k-map "c" 'ws-copy-block) - (define-key wordstar-C-k-map "\C-c" 'ws-copy-block) - (define-key wordstar-C-k-map "d" 'save-buffers-kill-emacs) - (define-key wordstar-C-k-map "\C-d" 'save-buffers-kill-emacs) - (define-key wordstar-C-k-map "f" 'find-file) - (define-key wordstar-C-k-map "\C-f" 'find-file) - (define-key wordstar-C-k-map "h" 'ws-show-markers) - (define-key wordstar-C-k-map "\C-h" 'ws-show-markers) - (define-key wordstar-C-k-map "i" 'ws-indent-block) - (define-key wordstar-C-k-map "\C-i" 'ws-indent-block) - (define-key wordstar-C-k-map "k" 'ws-end-block) - (define-key wordstar-C-k-map "\C-k" 'ws-end-block) - (define-key wordstar-C-k-map "p" 'ws-print-block) - (define-key wordstar-C-k-map "\C-p" 'ws-print-block) - (define-key wordstar-C-k-map "q" 'kill-emacs) - (define-key wordstar-C-k-map "\C-q" 'kill-emacs) - (define-key wordstar-C-k-map "r" 'insert-file) - (define-key wordstar-C-k-map "\C-r" 'insert-file) - (define-key wordstar-C-k-map "s" 'save-some-buffers) - (define-key wordstar-C-k-map "\C-s" 'save-some-buffers) - (define-key wordstar-C-k-map "t" 'ws-mark-word) - (define-key wordstar-C-k-map "\C-t" 'ws-mark-word) - (define-key wordstar-C-k-map "u" 'ws-exdent-block) - (define-key wordstar-C-k-map "\C-u" 'keyboard-quit) - (define-key wordstar-C-k-map "v" 'ws-move-block) - (define-key wordstar-C-k-map "\C-v" 'ws-move-block) - (define-key wordstar-C-k-map "w" 'ws-write-block) - (define-key wordstar-C-k-map "\C-w" 'ws-write-block) - (define-key wordstar-C-k-map "x" 'save-buffers-kill-emacs) - (define-key wordstar-C-k-map "\C-x" 'save-buffers-kill-emacs) - (define-key wordstar-C-k-map "y" 'ws-delete-block) - (define-key wordstar-C-k-map "\C-y" 'ws-delete-block) - - ;; wordstar-C-j-map not yet implemented - - ;; wordstar-C-o-map - - (define-key wordstar-C-o-map " " ()) - (define-key wordstar-C-o-map "c" 'wordstar-center-line) - (define-key wordstar-C-o-map "\C-c" 'wordstar-center-line) - (define-key wordstar-C-o-map "b" 'switch-to-buffer) - (define-key wordstar-C-o-map "\C-b" 'switch-to-buffer) - (define-key wordstar-C-o-map "j" 'justify-current-line) - (define-key wordstar-C-o-map "\C-j" 'justify-current-line) - (define-key wordstar-C-o-map "k" 'kill-buffer) - (define-key wordstar-C-o-map "\C-k" 'kill-buffer) - (define-key wordstar-C-o-map "l" 'list-buffers) - (define-key wordstar-C-o-map "\C-l" 'list-buffers) - (define-key wordstar-C-o-map "m" 'auto-fill-mode) - (define-key wordstar-C-o-map "\C-m" 'auto-fill-mode) - (define-key wordstar-C-o-map "r" 'set-fill-column) - (define-key wordstar-C-o-map "\C-r" 'set-fill-column) - (define-key wordstar-C-o-map "\C-u" 'keyboard-quit) - (define-key wordstar-C-o-map "wd" 'delete-other-windows) - (define-key wordstar-C-o-map "wh" 'split-window-horizontally) - (define-key wordstar-C-o-map "wo" 'other-window) - (define-key wordstar-C-o-map "wv" 'split-window-vertically) - - ;; wordstar-C-q-map - (define-key wordstar-C-q-map " " ()) - (define-key wordstar-C-q-map "0" 'ws-find-marker-0) - (define-key wordstar-C-q-map "1" 'ws-find-marker-1) - (define-key wordstar-C-q-map "2" 'ws-find-marker-2) - (define-key wordstar-C-q-map "3" 'ws-find-marker-3) - (define-key wordstar-C-q-map "4" 'ws-find-marker-4) - (define-key wordstar-C-q-map "5" 'ws-find-marker-5) - (define-key wordstar-C-q-map "6" 'ws-find-marker-6) - (define-key wordstar-C-q-map "7" 'ws-find-marker-7) - (define-key wordstar-C-q-map "8" 'ws-find-marker-8) - (define-key wordstar-C-q-map "9" 'ws-find-marker-9) - (define-key wordstar-C-q-map "a" 'ws-query-replace) - (define-key wordstar-C-q-map "\C-a" 'ws-query-replace) - (define-key wordstar-C-q-map "b" 'ws-goto-block-begin) - (define-key wordstar-C-q-map "\C-b" 'ws-goto-block-begin) - (define-key wordstar-C-q-map "c" 'end-of-buffer) - (define-key wordstar-C-q-map "\C-c" 'end-of-buffer) - (define-key wordstar-C-q-map "d" 'end-of-line) - (define-key wordstar-C-q-map "\C-d" 'end-of-line) - (define-key wordstar-C-q-map "f" 'ws-search) - (define-key wordstar-C-q-map "\C-f" 'ws-search) - (define-key wordstar-C-q-map "k" 'ws-goto-block-end) - (define-key wordstar-C-q-map "\C-k" 'ws-goto-block-end) - (define-key wordstar-C-q-map "l" 'ws-undo) - (define-key wordstar-C-q-map "\C-l" 'ws-undo) - (define-key wordstar-C-q-map "p" 'ws-last-cursorp) - (define-key wordstar-C-q-map "\C-p" 'ws-last-cursorp) - (define-key wordstar-C-q-map "r" 'beginning-of-buffer) - (define-key wordstar-C-q-map "\C-r" 'beginning-of-buffer) - (define-key wordstar-C-q-map "s" 'beginning-of-line) - (define-key wordstar-C-q-map "\C-s" 'beginning-of-line) - (define-key wordstar-C-q-map "\C-u" 'keyboard-quit) - (define-key wordstar-C-q-map "w" 'ws-last-error) - (define-key wordstar-C-q-map "\C-w" 'ws-last-error) - (define-key wordstar-C-q-map "y" 'ws-kill-eol) - (define-key wordstar-C-q-map "\C-y" 'ws-kill-eol) - (define-key wordstar-C-q-map "\177" 'ws-kill-bol)) + (put 'wordstar-mode 'mode-class 'special) === modified file 'lisp/erc/erc-list.el' --- lisp/erc/erc-list.el 2010-01-13 08:35:10 +0000 +++ lisp/erc/erc-list.el 2010-10-10 23:12:30 +0000 @@ -117,19 +117,18 @@ (sort-fields col (point-min) (point-max)) (sort-numeric-fields col (point-min) (point-max)))))) -(defvar erc-list-menu-mode-map nil +(defvar erc-list-menu-mode-map + (let ((map (make-keymap))) + (suppress-keymap map) + (define-key map "k" 'erc-list-kill) + (define-key map "j" 'erc-list-join) + (define-key map "g" 'erc-list-revert) + (define-key map "n" 'next-line) + (define-key map "p" 'previous-line) + (define-key map "q" 'quit-window) + map) "Local keymap for `erc-list-mode' buffers.") -(unless erc-list-menu-mode-map - (setq erc-list-menu-mode-map (make-keymap)) - (suppress-keymap erc-list-menu-mode-map) - (define-key erc-list-menu-mode-map "k" 'erc-list-kill) - (define-key erc-list-menu-mode-map "j" 'erc-list-join) - (define-key erc-list-menu-mode-map "g" 'erc-list-revert) - (define-key erc-list-menu-mode-map "n" 'next-line) - (define-key erc-list-menu-mode-map "p" 'previous-line) - (define-key erc-list-menu-mode-map "q" 'quit-window)) - (defvar erc-list-menu-sort-button-map nil "Local keymap for ERC list menu mode sorting buttons.") === modified file 'lisp/hexl.el' --- lisp/hexl.el 2010-01-14 14:37:13 +0000 +++ lisp/hexl.el 2010-10-10 23:12:30 +0000 @@ -97,7 +97,99 @@ (defvar hexl-max-address 0 "Maximum offset into hexl buffer.") -(defvar hexl-mode-map nil) +(defvar hexl-mode-map + (let ((map (make-keymap))) + ;; Make all self-inserting keys go through hexl-self-insert-command, + ;; because we need to convert them to unibyte characters before + ;; inserting them into the buffer. + (define-key map [remap self-insert-command] 'hexl-self-insert-command) + + (define-key map "\C-m" 'hexl-self-insert-command) + (define-key map [left] 'hexl-backward-char) + (define-key map [right] 'hexl-forward-char) + (define-key map [up] 'hexl-previous-line) + (define-key map [down] 'hexl-next-line) + (define-key map [M-left] 'hexl-backward-short) + (define-key map [?\e left] 'hexl-backward-short) + (define-key map [M-right] 'hexl-forward-short) + (define-key map [?\e right] 'hexl-forward-short) + (define-key map [next] 'hexl-scroll-up) + (define-key map [prior] 'hexl-scroll-down) + (define-key map [home] 'hexl-beginning-of-line) + (define-key map [end] 'hexl-end-of-line) + (define-key map [C-home] 'hexl-beginning-of-buffer) + (define-key map [C-end] 'hexl-end-of-buffer) + (define-key map [deletechar] 'undefined) + (define-key map [deleteline] 'undefined) + (define-key map [insertline] 'undefined) + (define-key map [S-delete] 'undefined) + (define-key map "\177" 'undefined) + + (define-key map "\C-a" 'hexl-beginning-of-line) + (define-key map "\C-b" 'hexl-backward-char) + (define-key map "\C-d" 'undefined) + (define-key map "\C-e" 'hexl-end-of-line) + (define-key map "\C-f" 'hexl-forward-char) + + (if (not (memq (key-binding (char-to-string help-char)) + '(help-command ehelp-command))) + (define-key map (char-to-string help-char) 'undefined)) + + (define-key map "\C-k" 'undefined) + (define-key map "\C-n" 'hexl-next-line) + (define-key map "\C-o" 'undefined) + (define-key map "\C-p" 'hexl-previous-line) + (define-key map "\C-q" 'hexl-quoted-insert) + (define-key map "\C-t" 'undefined) + (define-key map "\C-v" 'hexl-scroll-up) + (define-key map "\C-w" 'undefined) + (define-key map "\C-y" 'undefined) + + (fset 'hexl-ESC-prefix (copy-keymap 'ESC-prefix)) + (define-key map "\e" 'hexl-ESC-prefix) + (define-key map "\e\C-a" 'hexl-beginning-of-512b-page) + (define-key map "\e\C-b" 'hexl-backward-short) + (define-key map "\e\C-d" 'hexl-insert-decimal-char) + (define-key map "\e\C-e" 'hexl-end-of-512b-page) + (define-key map "\e\C-f" 'hexl-forward-short) + (define-key map "\e\C-i" 'undefined) + (define-key map "\e\C-j" 'undefined) + (define-key map "\e\C-k" 'undefined) + (define-key map "\e\C-o" 'hexl-insert-octal-char) + (define-key map "\e\C-q" 'undefined) + (define-key map "\e\C-t" 'undefined) + (define-key map "\e\C-x" 'hexl-insert-hex-char) + (define-key map "\eb" 'hexl-backward-word) + (define-key map "\ec" 'undefined) + (define-key map "\ed" 'undefined) + (define-key map "\ef" 'hexl-forward-word) + (define-key map "\eg" 'hexl-goto-hex-address) + (define-key map "\ei" 'undefined) + (define-key map "\ej" 'hexl-goto-address) + (define-key map "\ek" 'undefined) + (define-key map "\el" 'undefined) + (define-key map "\eq" 'undefined) + (define-key map "\es" 'undefined) + (define-key map "\et" 'undefined) + (define-key map "\eu" 'undefined) + (define-key map "\ev" 'hexl-scroll-down) + (define-key map "\ey" 'undefined) + (define-key map "\ez" 'undefined) + (define-key map "\e<" 'hexl-beginning-of-buffer) + (define-key map "\e>" 'hexl-end-of-buffer) + + (fset 'hexl-C-c-prefix (copy-keymap mode-specific-map)) + (define-key map "\C-c" 'hexl-C-c-prefix) + (define-key map "\C-c\C-c" 'hexl-mode-exit) + + (fset 'hexl-C-x-prefix (copy-keymap 'Control-X-prefix)) + (define-key map "\C-x" 'hexl-C-x-prefix) + (define-key map "\C-x[" 'hexl-beginning-of-1k-page) + (define-key map "\C-x]" 'hexl-end-of-1k-page) + (define-key map "\C-x\C-p" 'undefined) + (define-key map "\C-x\C-s" 'hexl-save-buffer) + (define-key map "\C-x\C-t" 'undefined) + map)) ;; Variable declarations for suppressing warnings from the byte-compiler. (defvar ruler-mode) @@ -1017,100 +1109,6 @@ ;; startup stuff. -(if hexl-mode-map - nil - (setq hexl-mode-map (make-keymap)) - ;; Make all self-inserting keys go through hexl-self-insert-command, - ;; because we need to convert them to unibyte characters before - ;; inserting them into the buffer. - (define-key hexl-mode-map [remap self-insert-command] 'hexl-self-insert-command) - - (define-key hexl-mode-map "\C-m" 'hexl-self-insert-command) - (define-key hexl-mode-map [left] 'hexl-backward-char) - (define-key hexl-mode-map [right] 'hexl-forward-char) - (define-key hexl-mode-map [up] 'hexl-previous-line) - (define-key hexl-mode-map [down] 'hexl-next-line) - (define-key hexl-mode-map [M-left] 'hexl-backward-short) - (define-key hexl-mode-map [?\e left] 'hexl-backward-short) - (define-key hexl-mode-map [M-right] 'hexl-forward-short) - (define-key hexl-mode-map [?\e right] 'hexl-forward-short) - (define-key hexl-mode-map [next] 'hexl-scroll-up) - (define-key hexl-mode-map [prior] 'hexl-scroll-down) - (define-key hexl-mode-map [home] 'hexl-beginning-of-line) - (define-key hexl-mode-map [end] 'hexl-end-of-line) - (define-key hexl-mode-map [C-home] 'hexl-beginning-of-buffer) - (define-key hexl-mode-map [C-end] 'hexl-end-of-buffer) - (define-key hexl-mode-map [deletechar] 'undefined) - (define-key hexl-mode-map [deleteline] 'undefined) - (define-key hexl-mode-map [insertline] 'undefined) - (define-key hexl-mode-map [S-delete] 'undefined) - (define-key hexl-mode-map "\177" 'undefined) - - (define-key hexl-mode-map "\C-a" 'hexl-beginning-of-line) - (define-key hexl-mode-map "\C-b" 'hexl-backward-char) - (define-key hexl-mode-map "\C-d" 'undefined) - (define-key hexl-mode-map "\C-e" 'hexl-end-of-line) - (define-key hexl-mode-map "\C-f" 'hexl-forward-char) - - (if (not (memq (key-binding (char-to-string help-char)) - '(help-command ehelp-command))) - (define-key hexl-mode-map (char-to-string help-char) 'undefined)) - - (define-key hexl-mode-map "\C-k" 'undefined) - (define-key hexl-mode-map "\C-n" 'hexl-next-line) - (define-key hexl-mode-map "\C-o" 'undefined) - (define-key hexl-mode-map "\C-p" 'hexl-previous-line) - (define-key hexl-mode-map "\C-q" 'hexl-quoted-insert) - (define-key hexl-mode-map "\C-t" 'undefined) - (define-key hexl-mode-map "\C-v" 'hexl-scroll-up) - (define-key hexl-mode-map "\C-w" 'undefined) - (define-key hexl-mode-map "\C-y" 'undefined) - - (fset 'hexl-ESC-prefix (copy-keymap 'ESC-prefix)) - (define-key hexl-mode-map "\e" 'hexl-ESC-prefix) - (define-key hexl-mode-map "\e\C-a" 'hexl-beginning-of-512b-page) - (define-key hexl-mode-map "\e\C-b" 'hexl-backward-short) - (define-key hexl-mode-map "\e\C-d" 'hexl-insert-decimal-char) - (define-key hexl-mode-map "\e\C-e" 'hexl-end-of-512b-page) - (define-key hexl-mode-map "\e\C-f" 'hexl-forward-short) - (define-key hexl-mode-map "\e\C-i" 'undefined) - (define-key hexl-mode-map "\e\C-j" 'undefined) - (define-key hexl-mode-map "\e\C-k" 'undefined) - (define-key hexl-mode-map "\e\C-o" 'hexl-insert-octal-char) - (define-key hexl-mode-map "\e\C-q" 'undefined) - (define-key hexl-mode-map "\e\C-t" 'undefined) - (define-key hexl-mode-map "\e\C-x" 'hexl-insert-hex-char) - (define-key hexl-mode-map "\eb" 'hexl-backward-word) - (define-key hexl-mode-map "\ec" 'undefined) - (define-key hexl-mode-map "\ed" 'undefined) - (define-key hexl-mode-map "\ef" 'hexl-forward-word) - (define-key hexl-mode-map "\eg" 'hexl-goto-hex-address) - (define-key hexl-mode-map "\ei" 'undefined) - (define-key hexl-mode-map "\ej" 'hexl-goto-address) - (define-key hexl-mode-map "\ek" 'undefined) - (define-key hexl-mode-map "\el" 'undefined) - (define-key hexl-mode-map "\eq" 'undefined) - (define-key hexl-mode-map "\es" 'undefined) - (define-key hexl-mode-map "\et" 'undefined) - (define-key hexl-mode-map "\eu" 'undefined) - (define-key hexl-mode-map "\ev" 'hexl-scroll-down) - (define-key hexl-mode-map "\ey" 'undefined) - (define-key hexl-mode-map "\ez" 'undefined) - (define-key hexl-mode-map "\e<" 'hexl-beginning-of-buffer) - (define-key hexl-mode-map "\e>" 'hexl-end-of-buffer) - - (fset 'hexl-C-c-prefix (copy-keymap mode-specific-map)) - (define-key hexl-mode-map "\C-c" 'hexl-C-c-prefix) - (define-key hexl-mode-map "\C-c\C-c" 'hexl-mode-exit) - - (fset 'hexl-C-x-prefix (copy-keymap 'Control-X-prefix)) - (define-key hexl-mode-map "\C-x" 'hexl-C-x-prefix) - (define-key hexl-mode-map "\C-x[" 'hexl-beginning-of-1k-page) - (define-key hexl-mode-map "\C-x]" 'hexl-end-of-1k-page) - (define-key hexl-mode-map "\C-x\C-p" 'undefined) - (define-key hexl-mode-map "\C-x\C-s" 'hexl-save-buffer) - (define-key hexl-mode-map "\C-x\C-t" 'undefined)) - (easy-menu-define hexl-menu hexl-mode-map "Hexl Mode menu" `("Hexl" :help "Hexl-specific Features" === modified file 'lisp/mail/mspools.el' --- lisp/mail/mspools.el 2010-01-13 08:35:10 +0000 +++ lisp/mail/mspools.el 2010-10-10 23:12:30 +0000 @@ -172,7 +172,16 @@ (defvar mspools-buffer "*spools*" "Name of buffer for displaying spool info.") -(defvar mspools-mode-map nil +(defvar mspools-mode-map + (let ((map (make-sparse-keymap))) + (define-key map "\C-c\C-c" 'mspools-visit-spool) + (define-key map "\C-m" 'mspools-visit-spool) + (define-key map " " 'mspools-visit-spool) + (define-key map "?" 'mspools-help) + (define-key map "q" 'mspools-quit) + (define-key map "n" 'next-line) + (define-key map "p" 'previous-line) + (define-key map "g" 'revert-buffer)) "Keymap for the *spools* buffer.") ;;; Code @@ -320,21 +329,6 @@ )))) (car (nth line-num mspools-files)))) -;;; Keymap - -(if mspools-mode-map - () - (setq mspools-mode-map (make-sparse-keymap)) - - (define-key mspools-mode-map "\C-c\C-c" 'mspools-visit-spool) - (define-key mspools-mode-map "\C-m" 'mspools-visit-spool) - (define-key mspools-mode-map " " 'mspools-visit-spool) - (define-key mspools-mode-map "?" 'mspools-help) - (define-key mspools-mode-map "q" 'mspools-quit) - (define-key mspools-mode-map "n" 'next-line) - (define-key mspools-mode-map "p" 'previous-line) - (define-key mspools-mode-map "g" 'revert-buffer)) - ;;; Spools mode functions (defun mspools-revert-buffer (ignore noconfirm) === modified file 'lisp/net/dig.el' --- lisp/net/dig.el 2010-09-02 00:55:51 +0000 +++ lisp/net/dig.el 2010-10-10 23:12:30 +0000 @@ -129,12 +129,11 @@ (put 'dig-mode 'mode-class 'special) -(defvar dig-mode-map nil) -(unless dig-mode-map - (setq dig-mode-map (make-sparse-keymap)) - (suppress-keymap dig-mode-map) - - (define-key dig-mode-map "q" 'dig-exit)) +(defvar dig-mode-map + (let ((map (make-sparse-keymap))) + (suppress-keymap map) + (define-key map "q" 'dig-exit) + map)) (define-derived-mode dig-mode nil "Dig" "Major mode for displaying dig output." === modified file 'lisp/net/eudc-hotlist.el' --- lisp/net/eudc-hotlist.el 2010-08-29 16:17:13 +0000 +++ lisp/net/eudc-hotlist.el 2010-10-10 23:12:30 +0000 @@ -33,9 +33,18 @@ (require 'eudc) (defvar eudc-hotlist-menu nil) -(defvar eudc-hotlist-mode-map nil) (defvar eudc-hotlist-list-beginning nil) +(defvar eudc-hotlist-mode-map + (let ((map (make-sparse-keymap))) + (define-key map "a" 'eudc-hotlist-add-server) + (define-key map "d" 'eudc-hotlist-delete-server) + (define-key map "s" 'eudc-hotlist-select-server) + (define-key map "t" 'eudc-hotlist-transpose-servers) + (define-key map "q" 'eudc-hotlist-quit-edit) + (define-key map "x" 'kill-this-buffer) + map)) + (defun eudc-hotlist-mode () "Major mode used to edit the hotlist of servers. @@ -169,16 +178,6 @@ (forward-line 1) (transpose-lines 1)))))) -(setq eudc-hotlist-mode-map - (let ((map (make-sparse-keymap))) - (define-key map "a" 'eudc-hotlist-add-server) - (define-key map "d" 'eudc-hotlist-delete-server) - (define-key map "s" 'eudc-hotlist-select-server) - (define-key map "t" 'eudc-hotlist-transpose-servers) - (define-key map "q" 'eudc-hotlist-quit-edit) - (define-key map "x" 'kill-this-buffer) - map)) - (defconst eudc-hotlist-menu '("EUDC Hotlist Edit" ["---" nil nil] === modified file 'lisp/net/mairix.el' --- lisp/net/mairix.el 2010-01-15 16:55:43 +0000 +++ lisp/net/mairix.el 2010-10-10 23:12:30 +0000 @@ -735,23 +735,21 @@ ;;;; Major mode for editing/deleting/saving searches -(defvar mairix-searches-mode-map nil "'mairix-searches-mode' keymap.") - -;; Keymap -(if (not mairix-searches-mode-map) - (let ((map (make-keymap))) - (define-key map [(return)] 'mairix-select-search) - (define-key map [(down)] 'mairix-next-search) - (define-key map [(up)] 'mairix-previous-search) - (define-key map [(right)] 'mairix-next-search) - (define-key map [(left)] 'mairix-previous-search) - (define-key map "\C-p" 'mairix-previous-search) - (define-key map "\C-n" 'mairix-next-search) - (define-key map [(q)] 'mairix-select-quit) - (define-key map [(e)] 'mairix-select-edit) - (define-key map [(d)] 'mairix-select-delete) - (define-key map [(s)] 'mairix-select-save) - (setq mairix-searches-mode-map map))) +(defvar mairix-searches-mode-map + (let ((map (make-keymap))) + (define-key map [(return)] 'mairix-select-search) + (define-key map [(down)] 'mairix-next-search) + (define-key map [(up)] 'mairix-previous-search) + (define-key map [(right)] 'mairix-next-search) + (define-key map [(left)] 'mairix-previous-search) + (define-key map "\C-p" 'mairix-previous-search) + (define-key map "\C-n" 'mairix-next-search) + (define-key map [(q)] 'mairix-select-quit) + (define-key map [(e)] 'mairix-select-edit) + (define-key map [(d)] 'mairix-select-delete) + (define-key map [(s)] 'mairix-select-save) + (setq mairix-searches-mode-map map)) + "'mairix-searches-mode' keymap.") (defvar mairix-searches-mode-font-lock-keywords) === modified file 'lisp/net/quickurl.el' --- lisp/net/quickurl.el 2010-01-13 08:35:10 +0000 +++ lisp/net/quickurl.el 2010-10-10 23:12:30 +0000 @@ -173,7 +173,20 @@ (defvar quickurl-urls nil "URL alist for use with `quickurl' and `quickurl-ask'.") -(defvar quickurl-list-mode-map nil +(defvar quickurl-list-mode-map + (let ((map (make-sparse-keymap))) + (suppress-keymap map t) + (define-key map "a" #'quickurl-list-add-url) + (define-key map [(control m)] #'quickurl-list-insert-url) + (define-key map "u" #'quickurl-list-insert-naked-url) + (define-key map " " #'quickurl-list-insert-with-lookup) + (define-key map "l" #'quickurl-list-insert-lookup) + (define-key map "d" #'quickurl-list-insert-with-desc) + (define-key map [(control g)] #'quickurl-list-quit) + (define-key map "q" #'quickurl-list-quit) + (define-key map [mouse-2] #'quickurl-list-mouse-select) + (define-key map "?" #'describe-mode) + map) "Local keymap for a `quickurl-list-mode' buffer.") (defvar quickurl-list-buffer-name "*quickurl-list*" @@ -420,21 +433,6 @@ ;; quickurl-list mode. -(unless quickurl-list-mode-map - (let ((map (make-sparse-keymap))) - (suppress-keymap map t) - (define-key map "a" #'quickurl-list-add-url) - (define-key map [(control m)] #'quickurl-list-insert-url) - (define-key map "u" #'quickurl-list-insert-naked-url) - (define-key map " " #'quickurl-list-insert-with-lookup) - (define-key map "l" #'quickurl-list-insert-lookup) - (define-key map "d" #'quickurl-list-insert-with-desc) - (define-key map [(control g)] #'quickurl-list-quit) - (define-key map "q" #'quickurl-list-quit) - (define-key map [mouse-2] #'quickurl-list-mouse-select) - (define-key map "?" #'describe-mode) - (setq quickurl-list-mode-map map))) - (put 'quickurl-list-mode 'mode-class 'special) ;;;###autoload === modified file 'lisp/net/telnet.el' --- lisp/net/telnet.el 2010-01-13 08:35:10 +0000 +++ lisp/net/telnet.el 2010-10-10 23:12:30 +0000 @@ -61,7 +61,15 @@ LOGIN-NAME, which is optional, says what to log in as on that machine.") (defvar telnet-new-line "\r") -(defvar telnet-mode-map nil) +(defvar telnet-mode-map + (let ((map (nconc (make-sparse-keymap) comint-mode-map))) + (define-key telnet-mode-map "\C-m" 'telnet-send-input) + ;; (define-key telnet-mode-map "\C-j" 'telnet-send-input) + (define-key map "\C-c\C-q" 'send-process-next-char) + (define-key map "\C-c\C-c" 'telnet-interrupt-subjob) + (define-key map "\C-c\C-z" 'telnet-c-z) + map)) + (defvar telnet-prompt-pattern "^[^#$%>\n]*[#$%>] *") (defvar telnet-replace-c-g nil) (make-variable-buffer-local @@ -104,16 +112,6 @@ (prog1 (read-char) (setq quit-flag nil)))))) -; initialization on first load. -(if telnet-mode-map - nil - (setq telnet-mode-map (nconc (make-sparse-keymap) comint-mode-map)) - (define-key telnet-mode-map "\C-m" 'telnet-send-input) -; (define-key telnet-mode-map "\C-j" 'telnet-send-input) - (define-key telnet-mode-map "\C-c\C-q" 'send-process-next-char) - (define-key telnet-mode-map "\C-c\C-c" 'telnet-interrupt-subjob) - (define-key telnet-mode-map "\C-c\C-z" 'telnet-c-z)) - ;;maybe should have a flag for when have found type (defun telnet-check-software-type-initialize (string) "Tries to put correct initializations in. Needs work." === modified file 'lisp/play/5x5.el' --- lisp/play/5x5.el 2010-01-13 08:35:10 +0000 +++ lisp/play/5x5.el 2010-10-10 23:12:30 +0000 @@ -108,12 +108,7 @@ (defvar 5x5-buffer-name "*5x5*" "Name of the 5x5 play buffer.") -(defvar 5x5-mode-map nil - "Local keymap for the 5x5 game.") - -;; Keymap. - -(unless 5x5-mode-map +(defvar 5x5-mode-map (let ((map (make-sparse-keymap))) (suppress-keymap map t) (define-key map "?" #'describe-mode) @@ -141,7 +136,8 @@ (define-key map [(control c) (control x)] #'5x5-crack-xor-mutate) (define-key map "n" #'5x5-new-game) (define-key map "q" #'5x5-quit-game) - (setq 5x5-mode-map map))) + map) + "Local keymap for the 5x5 game.") ;; Menu definition. === modified file 'lisp/play/decipher.el' --- lisp/play/decipher.el 2010-05-25 02:11:08 +0000 +++ lisp/play/decipher.el 2010-10-10 23:12:30 +0000 @@ -154,38 +154,37 @@ 'bold))) in your `.emacs' file.") -(defvar decipher-mode-map nil +(defvar decipher-mode-map + (let ((map (make-keymap))) + (suppress-keymap map) + (define-key map "A" 'decipher-show-alphabet) + (define-key map "C" 'decipher-complete-alphabet) + (define-key map "D" 'decipher-digram-list) + (define-key map "F" 'decipher-frequency-count) + (define-key map "M" 'decipher-make-checkpoint) + (define-key map "N" 'decipher-adjacency-list) + (define-key map "R" 'decipher-restore-checkpoint) + (define-key map "U" 'decipher-undo) + (define-key map " " 'decipher-keypress) + (define-key map [remap undo] 'decipher-undo) + (define-key map [remap advertised-undo] 'decipher-undo) + (let ((key ?a)) + (while (<= key ?z) + (define-key map (vector key) 'decipher-keypress) + (incf key))) + map) "Keymap for Decipher mode.") -(if (not decipher-mode-map) - (progn - (setq decipher-mode-map (make-keymap)) - (suppress-keymap decipher-mode-map) - (define-key decipher-mode-map "A" 'decipher-show-alphabet) - (define-key decipher-mode-map "C" 'decipher-complete-alphabet) - (define-key decipher-mode-map "D" 'decipher-digram-list) - (define-key decipher-mode-map "F" 'decipher-frequency-count) - (define-key decipher-mode-map "M" 'decipher-make-checkpoint) - (define-key decipher-mode-map "N" 'decipher-adjacency-list) - (define-key decipher-mode-map "R" 'decipher-restore-checkpoint) - (define-key decipher-mode-map "U" 'decipher-undo) - (define-key decipher-mode-map " " 'decipher-keypress) - (define-key decipher-mode-map [remap undo] 'decipher-undo) - (define-key decipher-mode-map [remap advertised-undo] 'decipher-undo) - (let ((key ?a)) - (while (<= key ?z) - (define-key decipher-mode-map (vector key) 'decipher-keypress) - (incf key))))) - -(defvar decipher-stats-mode-map nil - "Keymap for Decipher-Stats mode.") -(if (not decipher-stats-mode-map) - (progn - (setq decipher-stats-mode-map (make-keymap)) - (suppress-keymap decipher-stats-mode-map) - (define-key decipher-stats-mode-map "D" 'decipher-digram-list) - (define-key decipher-stats-mode-map "F" 'decipher-frequency-count) - (define-key decipher-stats-mode-map "N" 'decipher-adjacency-list) - )) + + +(defvar decipher-stats-mode-map + (let ((map (make-keymap))) + (suppress-keymap map) + (define-key map "D" 'decipher-digram-list) + (define-key map "F" 'decipher-frequency-count) + (define-key map "N" 'decipher-adjacency-list) + map) +"Keymap for Decipher-Stats mode.") + (defvar decipher-mode-syntax-table nil "Decipher mode syntax table") === modified file 'lisp/play/landmark.el' --- lisp/play/landmark.el 2010-01-13 08:35:10 +0000 +++ lisp/play/landmark.el 2010-10-10 23:12:30 +0000 @@ -159,52 +159,52 @@ :type 'hook :group 'lm) -(defvar lm-mode-map nil +(defvar lm-mode-map + (let ((map (make-sparse-keymap))) + ;; Key bindings for cursor motion. + (define-key map "y" 'lm-move-nw) ; y + (define-key map "u" 'lm-move-ne) ; u + (define-key map "b" 'lm-move-sw) ; b + (define-key map "n" 'lm-move-se) ; n + (define-key map "h" 'backward-char) ; h + (define-key map "l" 'forward-char) ; l + (define-key map "j" 'lm-move-down) ; j + (define-key map "k" 'lm-move-up) ; k + + (define-key map [kp-7] 'lm-move-nw) + (define-key map [kp-9] 'lm-move-ne) + (define-key map [kp-1] 'lm-move-sw) + (define-key map [kp-3] 'lm-move-se) + (define-key map [kp-4] 'backward-char) + (define-key map [kp-6] 'forward-char) + (define-key map [kp-2] 'lm-move-down) + (define-key map [kp-8] 'lm-move-up) + + (define-key map "\C-n" 'lm-move-down) ; C-n + (define-key map "\C-p" 'lm-move-up) ; C-p + + ;; Key bindings for entering Human moves. + (define-key map "X" 'lm-human-plays) ; X + (define-key map "x" 'lm-human-plays) ; x + + (define-key map " " 'lm-start-robot) ; SPC + (define-key map [down-mouse-1] 'lm-start-robot) + (define-key map [drag-mouse-1] 'lm-click) + (define-key map [mouse-1] 'lm-click) + (define-key map [down-mouse-2] 'lm-click) + (define-key map [mouse-2] 'lm-mouse-play) + (define-key map [drag-mouse-2] 'lm-mouse-play) + + (define-key map [remap previous-line] 'lm-move-up) + (define-key map [remap next-line] 'lm-move-down) + (define-key map [remap beginning-of-line] 'lm-beginning-of-line) + (define-key map [remap end-of-line] 'lm-end-of-line) + (define-key map [remap undo] 'lm-human-takes-back) + (define-key map [remap advertised-undo] 'lm-human-takes-back) + map) "Local keymap to use in Lm mode.") -(if lm-mode-map nil - (setq lm-mode-map (make-sparse-keymap)) - - ;; Key bindings for cursor motion. - (define-key lm-mode-map "y" 'lm-move-nw) ; y - (define-key lm-mode-map "u" 'lm-move-ne) ; u - (define-key lm-mode-map "b" 'lm-move-sw) ; b - (define-key lm-mode-map "n" 'lm-move-se) ; n - (define-key lm-mode-map "h" 'backward-char) ; h - (define-key lm-mode-map "l" 'forward-char) ; l - (define-key lm-mode-map "j" 'lm-move-down) ; j - (define-key lm-mode-map "k" 'lm-move-up) ; k - - (define-key lm-mode-map [kp-7] 'lm-move-nw) - (define-key lm-mode-map [kp-9] 'lm-move-ne) - (define-key lm-mode-map [kp-1] 'lm-move-sw) - (define-key lm-mode-map [kp-3] 'lm-move-se) - (define-key lm-mode-map [kp-4] 'backward-char) - (define-key lm-mode-map [kp-6] 'forward-char) - (define-key lm-mode-map [kp-2] 'lm-move-down) - (define-key lm-mode-map [kp-8] 'lm-move-up) - - (define-key lm-mode-map "\C-n" 'lm-move-down) ; C-n - (define-key lm-mode-map "\C-p" 'lm-move-up) ; C-p - - ;; Key bindings for entering Human moves. - (define-key lm-mode-map "X" 'lm-human-plays) ; X - (define-key lm-mode-map "x" 'lm-human-plays) ; x - - (define-key lm-mode-map " " 'lm-start-robot) ; SPC - (define-key lm-mode-map [down-mouse-1] 'lm-start-robot) - (define-key lm-mode-map [drag-mouse-1] 'lm-click) - (define-key lm-mode-map [mouse-1] 'lm-click) - (define-key lm-mode-map [down-mouse-2] 'lm-click) - (define-key lm-mode-map [mouse-2] 'lm-mouse-play) - (define-key lm-mode-map [drag-mouse-2] 'lm-mouse-play) - - (define-key lm-mode-map [remap previous-line] 'lm-move-up) - (define-key lm-mode-map [remap next-line] 'lm-move-down) - (define-key lm-mode-map [remap beginning-of-line] 'lm-beginning-of-line) - (define-key lm-mode-map [remap end-of-line] 'lm-end-of-line) - (define-key lm-mode-map [remap undo] 'lm-human-takes-back) - (define-key lm-mode-map [remap advertised-undo] 'lm-human-takes-back)) + (defvar lm-emacs-won () "*For making font-lock use the winner's face for the line.") === modified file 'lisp/play/mpuz.el' --- lisp/play/mpuz.el 2010-01-13 08:35:10 +0000 +++ lisp/play/mpuz.el 2010-10-10 23:12:30 +0000 @@ -87,33 +87,34 @@ :type 'hook :group 'mpuz) -(defvar mpuz-mode-map nil +(defvar mpuz-mode-map + (let ((map (make-sparse-keymap))) + (define-key map "a" 'mpuz-try-letter) + (define-key map "b" 'mpuz-try-letter) + (define-key map "c" 'mpuz-try-letter) + (define-key map "d" 'mpuz-try-letter) + (define-key map "e" 'mpuz-try-letter) + (define-key map "f" 'mpuz-try-letter) + (define-key map "g" 'mpuz-try-letter) + (define-key map "h" 'mpuz-try-letter) + (define-key map "i" 'mpuz-try-letter) + (define-key map "j" 'mpuz-try-letter) + (define-key map "A" 'mpuz-try-letter) + (define-key map "B" 'mpuz-try-letter) + (define-key map "C" 'mpuz-try-letter) + (define-key map "D" 'mpuz-try-letter) + (define-key map "E" 'mpuz-try-letter) + (define-key map "F" 'mpuz-try-letter) + (define-key map "G" 'mpuz-try-letter) + (define-key map "H" 'mpuz-try-letter) + (define-key map "I" 'mpuz-try-letter) + (define-key map "J" 'mpuz-try-letter) + (define-key map "\C-g" 'mpuz-offer-abort) + (define-key map "?" 'describe-mode) + map) "Local keymap to use in Mult Puzzle.") -(if mpuz-mode-map nil - (setq mpuz-mode-map (make-sparse-keymap)) - (define-key mpuz-mode-map "a" 'mpuz-try-letter) - (define-key mpuz-mode-map "b" 'mpuz-try-letter) - (define-key mpuz-mode-map "c" 'mpuz-try-letter) - (define-key mpuz-mode-map "d" 'mpuz-try-letter) - (define-key mpuz-mode-map "e" 'mpuz-try-letter) - (define-key mpuz-mode-map "f" 'mpuz-try-letter) - (define-key mpuz-mode-map "g" 'mpuz-try-letter) - (define-key mpuz-mode-map "h" 'mpuz-try-letter) - (define-key mpuz-mode-map "i" 'mpuz-try-letter) - (define-key mpuz-mode-map "j" 'mpuz-try-letter) - (define-key mpuz-mode-map "A" 'mpuz-try-letter) - (define-key mpuz-mode-map "B" 'mpuz-try-letter) - (define-key mpuz-mode-map "C" 'mpuz-try-letter) - (define-key mpuz-mode-map "D" 'mpuz-try-letter) - (define-key mpuz-mode-map "E" 'mpuz-try-letter) - (define-key mpuz-mode-map "F" 'mpuz-try-letter) - (define-key mpuz-mode-map "G" 'mpuz-try-letter) - (define-key mpuz-mode-map "H" 'mpuz-try-letter) - (define-key mpuz-mode-map "I" 'mpuz-try-letter) - (define-key mpuz-mode-map "J" 'mpuz-try-letter) - (define-key mpuz-mode-map "\C-g" 'mpuz-offer-abort) - (define-key mpuz-mode-map "?" 'describe-mode)) + (defun mpuz-mode () "Multiplication puzzle mode. === modified file 'lisp/progmodes/inf-lisp.el' --- lisp/progmodes/inf-lisp.el 2010-01-13 08:35:10 +0000 +++ lisp/progmodes/inf-lisp.el 2010-10-10 23:12:30 +0000 @@ -80,19 +80,17 @@ :type 'regexp :group 'inferior-lisp) -(defvar inferior-lisp-mode-map nil) -(unless inferior-lisp-mode-map - (setq inferior-lisp-mode-map (copy-keymap comint-mode-map)) - (set-keymap-parent inferior-lisp-mode-map lisp-mode-shared-map) - (define-key inferior-lisp-mode-map "\C-x\C-e" 'lisp-eval-last-sexp) - (define-key inferior-lisp-mode-map "\C-c\C-l" 'lisp-load-file) - (define-key inferior-lisp-mode-map "\C-c\C-k" 'lisp-compile-file) - (define-key inferior-lisp-mode-map "\C-c\C-a" 'lisp-show-arglist) - (define-key inferior-lisp-mode-map "\C-c\C-d" 'lisp-describe-sym) - (define-key inferior-lisp-mode-map "\C-c\C-f" - 'lisp-show-function-documentation) - (define-key inferior-lisp-mode-map "\C-c\C-v" - 'lisp-show-variable-documentation)) +(defvar inferior-lisp-mode-map + (let ((map (copy-keymap comint-mode-map))) + (set-keymap-parent map lisp-mode-shared-map) + (define-key map "\C-x\C-e" 'lisp-eval-last-sexp) + (define-key map "\C-c\C-l" 'lisp-load-file) + (define-key map "\C-c\C-k" 'lisp-compile-file) + (define-key map "\C-c\C-a" 'lisp-show-arglist) + (define-key map "\C-c\C-d" 'lisp-describe-sym) + (define-key map "\C-c\C-f" 'lisp-show-function-documentation) + (define-key map "\C-c\C-v" 'lisp-show-variable-documentation) + map)) ;;; These commands augment Lisp mode, so you can process Lisp code in ;;; the source files. === modified file 'lisp/progmodes/modula2.el' --- lisp/progmodes/modula2.el 2010-01-04 05:35:18 +0000 +++ lisp/progmodes/modula2.el 2010-10-10 23:12:30 +0000 @@ -69,10 +69,7 @@ (setq m2-mode-syntax-table table))) ;;; Added by TEP -(defvar m2-mode-map nil - "Keymap used in Modula-2 mode.") - -(if m2-mode-map () +(defvar m2-mode-map (let ((map (make-sparse-keymap))) (define-key map "\^i" 'm2-tab) (define-key map "\C-cb" 'm2-begin) @@ -103,7 +100,8 @@ (define-key map "\C-c\C-t" 'm2-toggle) (define-key map "\C-c\C-l" 'm2-link) (define-key map "\C-c\C-c" 'm2-compile) - (setq m2-mode-map map))) + map) + "Keymap used in Modula-2 mode.") (defcustom m2-indent 5 "*This variable gives the indentation in Modula-2-Mode." === modified file 'lisp/shell.el' --- lisp/shell.el 2010-10-02 02:46:13 +0000 +++ lisp/shell.el 2010-10-10 23:12:30 +0000 @@ -334,26 +334,25 @@ (defvar shell-dirstack-query nil "Command used by `shell-resync-dirs' to query the shell.") -(defvar shell-mode-map nil) -(cond ((not shell-mode-map) - (setq shell-mode-map (nconc (make-sparse-keymap) comint-mode-map)) - (define-key shell-mode-map "\C-c\C-f" 'shell-forward-command) - (define-key shell-mode-map "\C-c\C-b" 'shell-backward-command) - (define-key shell-mode-map "\t" 'comint-dynamic-complete) - (define-key shell-mode-map (kbd "M-RET") 'shell-resync-dirs) - (define-key shell-mode-map "\M-?" - 'comint-dynamic-list-filename-completions) - (define-key shell-mode-map [menu-bar completion] - (cons "Complete" - (copy-keymap (lookup-key comint-mode-map [menu-bar completion])))) - (define-key-after (lookup-key shell-mode-map [menu-bar completion]) - [complete-env-variable] '("Complete Env. Variable Name" . - shell-dynamic-complete-environment-variable) - 'complete-file) - (define-key-after (lookup-key shell-mode-map [menu-bar completion]) - [expand-directory] '("Expand Directory Reference" . - shell-replace-by-expanded-directory) - 'complete-expand))) +(defvar shell-mode-map + (let ((map (nconc (make-sparse-keymap) comint-mode-map))) + (define-key map "\C-c\C-f" 'shell-forward-command) + (define-key map "\C-c\C-b" 'shell-backward-command) + (define-key map "\t" 'comint-dynamic-complete) + (define-key map (kbd "M-RET") 'shell-resync-dirs) + (define-key map "\M-?" 'comint-dynamic-list-filename-completions) + (define-key map [menu-bar completion] + (cons "Complete" + (copy-keymap (lookup-key comint-mode-map [menu-bar completion])))) + (define-key-after (lookup-key map [menu-bar completion]) + [complete-env-variable] '("Complete Env. Variable Name" . + shell-dynamic-complete-environment-variable) + 'complete-file) + (define-key-after (lookup-key map [menu-bar completion]) + [expand-directory] '("Expand Directory Reference" . + shell-replace-by-expanded-directory) + 'complete-expand) + map)) (defcustom shell-mode-hook '() "Hook for customizing Shell mode." ------------------------------------------------------------ revno: 101902 author: Gnus developers committer: Katsumi Yamaoka branch nick: trunk timestamp: Sun 2010-10-10 22:48:40 +0000 message: Merge changes made in Gnus trunk. nnimap.el (nnimap-wait-for-response): If the user hits `C-g', kill the process, too. nnir.el (gnus-summary-nnir-goto-thread): Modify to work with imap. nnimap.el (nnimap-update-info): If the server doesn't return any useful info, just use the previous info. nnimap.el (nnimap-update-info): Prefer old info over start-article. nnimap.el (nnimap-update-qresync-info): Finish implementing QRESYNC. auth-source.el (auth-source-create): Use (user-login-name) for the user name default. nnimap.el (nnimap-open-connection): Use gnutls STARTTLS, if available. nnimap.el (nnimap-update-info): Rely more on the current active than the param active to avoid marking articles as read too much. gnus-sum.el (gnus-summary-set-local-parameters): Ignore the `active' non-variable, too. nnimap.el (nnimap-update-qresync-info): \Flagged messages are read for Gnus. nnimap.el (nnimap-retrieve-group-data-early): utf7-encode the group parameters. nnimap.el (nnimap-update-qresync-info): Mark \Seen articles as read. diff: === modified file 'lisp/gnus/ChangeLog' --- lisp/gnus/ChangeLog 2010-10-10 00:15:21 +0000 +++ lisp/gnus/ChangeLog 2010-10-10 22:48:40 +0000 @@ -1,3 +1,41 @@ +2010-10-10 Lars Magne Ingebrigtsen + + * nnimap.el (nnimap-update-qresync-info): \Flagged messages are read + for Gnus. + (nnimap-retrieve-group-data-early): utf7-encode the group parameters. + (nnimap-update-qresync-info): Mark \Seen articles as read. + + * gnus-sum.el (gnus-summary-set-local-parameters): Ignore the `active' + non-variable, too. + + * nnimap.el (nnimap-open-connection): Use gnutls STARTTLS, if + available. + (nnimap-update-info): Rely more on the current active than the param + active to avoid marking articles as read too much. + + * auth-source.el (auth-source-create): Use (user-login-name) for the + user name default. + + * nnimap.el (nnimap-update-info): If the server doesn't return any + useful info, just use the previous info. + (nnimap-update-info): Prefer old info over start-article. + (nnimap-update-qresync-info): Finish implementing QRESYNC. + +2010-10-10 Andrew Cohen + + * nnir.el (autoload): Clean up autoloads. + (nnir-imap-default-search-key): Renamed from + nnir-imap-search-field. Use key rather than value. + (nnir-imap-search-other): New variable. + (nnir-read-parm): Use it. + (nnir-imap-expr-to-imap): Use %S rather than imap-quote-specials. + (gnus-summary-nnir-goto-thread): Modify to work with imap. + +2010-10-10 Stefan Monnier + + * nnimap.el (nnimap-wait-for-response): If the user hits `C-g', kill + the process, too. + 2010-10-09 Lars Magne Ingebrigtsen * spam.el (gnus-summary-mode-map): Bind to "$". Suggested by Russ === modified file 'lisp/gnus/auth-source.el' --- lisp/gnus/auth-source.el 2010-10-07 03:49:38 +0000 +++ lisp/gnus/auth-source.el 2010-10-10 22:48:40 +0000 @@ -336,7 +336,10 @@ passwd)) ((equal "login" m) (or user - (read-string (format "User name for %s on %s: " prot host)))) + (read-string + (format "User name for %s on %s (default %s): " prot host + (user-login-name)) + nil nil (user-login-name)))) (t "unknownuser")))) (if (consp mode) mode (list mode)))) === modified file 'lisp/gnus/gnus-sum.el' --- lisp/gnus/gnus-sum.el 2010-10-08 23:55:33 +0000 +++ lisp/gnus/gnus-sum.el 2010-10-10 22:48:40 +0000 @@ -3841,7 +3841,8 @@ (defun gnus-summary-set-local-parameters (group) "Go through the local params of GROUP and set all variable specs in that list." - (let ((vars '(quit-config))) ; Ignore quit-config. + (let ((vars '(quit-config active))) ; Ignore things that aren't + ; really variables. (dolist (elem (gnus-group-find-parameter group)) (and (consp elem) ; Has to be a cons. (consp (cdr elem)) ; The cdr has to be a list. === modified file 'lisp/gnus/nnimap.el' --- lisp/gnus/nnimap.el 2010-10-10 00:15:21 +0000 +++ lisp/gnus/nnimap.el 2010-10-10 22:48:40 +0000 @@ -295,7 +295,9 @@ (port nil) (ports (cond - ((eq nnimap-stream 'network) + ((or (eq nnimap-stream 'network) + (and (eq nnimap-stream 'starttls) + (fboundp 'open-gnutls-stream))) (open-network-stream "*nnimap*" (current-buffer) nnimap-address (setq port @@ -357,8 +359,16 @@ (push (format "%s" nnimap-server-port) ports)) ;; If this is a STARTTLS-capable server, then sever the ;; connection and start a STARTTLS connection instead. - (when (and (eq nnimap-stream 'network) - (member "STARTTLS" (nnimap-capabilities nnimap-object))) + (cond + ((and (or (and (eq nnimap-stream 'network) + (member "STARTTLS" + (nnimap-capabilities nnimap-object))) + (eq nnimap-stream 'starttls)) + (fboundp 'open-gnutls-stream)) + (nnimap-command "STARTTLS") + (gnutls-negotiate (nnimap-process nnimap-object) nil)) + ((and (eq nnimap-stream 'network) + (member "STARTTLS" (nnimap-capabilities nnimap-object))) (let ((nnimap-stream 'starttls)) (let ((tls-process (nnimap-open-connection buffer))) @@ -369,7 +379,7 @@ (when (memq (process-status tls-process) '(open run)) (delete-process (nnimap-process nnimap-object)) (kill-buffer (current-buffer)) - (return tls-process))))) + (return tls-process)))))) (unless (equal connection-result "PREAUTH") (if (not (setq credentials (if (eq nnimap-authenticator 'anonymous) @@ -949,7 +959,7 @@ (erase-buffer) (setf (nnimap-group nnimap-object) nil) ;; QRESYNC handling isn't implemented. - (let ((qresyncp (member "notQRESYNC" (nnimap-capabilities nnimap-object))) + (let ((qresyncp (member "QRESYNC" (nnimap-capabilities nnimap-object))) params groups sequences active uidvalidity modseq group) ;; Go through the infos and gather the data needed to know ;; what and how to request the data. @@ -964,7 +974,8 @@ modseq) (push (list (nnimap-send-command "EXAMINE %S (QRESYNC (%s %s))" - group uidvalidity modseq) + (utf7-encode group t) + uidvalidity modseq) 'qresync nil group 'qresync) sequences) @@ -982,7 +993,8 @@ ;; examine), but will tell us whether the group ;; is read-only or not. "SELECT"))) - (push (list (nnimap-send-command "%s %S" command group) + (push (list (nnimap-send-command "%s %S" command + (utf7-encode group t)) (nnimap-send-command "UID FETCH %d:* FLAGS" start) start group command) sequences))) @@ -1038,7 +1050,9 @@ ;; completely empty groups. ((and (not existing) (not uidnext)) - ) + (let ((active (cdr (assq 'active (gnus-info-params info))))) + (when active + (gnus-set-active (gnus-info-group info) active)))) ;; We have a mismatch between the old and new UIDVALIDITY ;; identifiers, so we have to re-request the group info (the next ;; time). This virtually never happens. @@ -1051,9 +1065,11 @@ (gnus-group-remove-parameter info 'modseq)) ;; We have the data needed to update. (t - (let ((group (gnus-info-group info)) - (completep (and start-article - (= start-article 1)))) + (let* ((group (gnus-info-group info)) + (completep (and start-article + (= start-article 1))) + (active (or (gnus-active group) + (cdr (assq 'active (gnus-info-params info)))))) (when uidnext (setq high (1- uidnext))) ;; First set the active ranges based on high/low. @@ -1066,6 +1082,8 @@ (uidnext ;; No articles in this group. (cons uidnext (1- uidnext))) + (active + active) (start-article (cons start-article (1- start-article))) (t @@ -1073,7 +1091,7 @@ nil))) (gnus-set-active group - (cons (car (gnus-active group)) + (cons (car active) (or high (1- uidnext))))) ;; See whether this is a read-only group. (unless (eq permanent-flags 'not-scanned) @@ -1089,7 +1107,7 @@ (not start-article)) ;; We've gotten the data by QRESYNCing. (nnimap-update-qresync-info - info (nnimap-imap-ranges-to-gnus-ranges vanished) flags) + info existing (nnimap-imap-ranges-to-gnus-ranges vanished) flags) ;; Do normal non-QRESYNC flag updates. ;; Update the list of read articles. (let* ((unread @@ -1137,13 +1155,35 @@ (gnus-group-set-parameter info 'modseq highestmodseq) (nnimap-store-info info (gnus-active group))))))) -(defun nnimap-update-qresync-info (info vanished flags) +(defun nnimap-update-qresync-info (info existing vanished flags) ;; Add all the vanished articles to the list of read articles. (gnus-info-set-read info - (gnus-range-add (gnus-info-read info) - vanished)) - ) + (gnus-add-to-range + (gnus-add-to-range + (gnus-range-add (gnus-info-read info) + vanished) + (cdr (assq '%Flagged flags))) + (cdr (assq '%Seen flags)))) + (let ((marks (gnus-info-marks info))) + (dolist (type (cdr nnimap-mark-alist)) + (let ((ticks (assoc (car type) marks)) + (new-marks + (cdr (or (assoc (caddr type) flags) ; %Flagged + (assoc (intern (cadr type) obarray) flags) + (assoc (cadr type) flags))))) ; "\Flagged" + (setq marks (delq ticks marks)) + (pop ticks) + ;; Add the new marks we got. + (setq ticks (gnus-add-to-range ticks new-marks)) + ;; Remove the marks from messages that don't have them. + (setq ticks (gnus-remove-from-range + ticks + (gnus-compress-sequence + (gnus-sorted-complement existing new-marks)))) + (when ticks + (push (cons (car type) ticks) marks))) + (gnus-info-set-marks info marks t)))) (defun nnimap-imap-ranges-to-gnus-ranges (irange) (if (zerop (length irange)) @@ -1355,20 +1395,28 @@ (defun nnimap-wait-for-response (sequence &optional messagep) (let ((process (get-buffer-process (current-buffer))) openp) - (goto-char (point-max)) - (while (and (setq openp (memq (process-status process) - '(open run))) - (not (re-search-backward - (format "^%d .*\n" sequence) - (if nnimap-streaming - (max (point-min) (- (point) 500)) - (point-min)) - t))) - (when messagep - (message "nnimap read %dk" (/ (buffer-size) 1000))) - (nnheader-accept-process-output process) - (goto-char (point-max))) - openp)) + (condition-case nil + (progn + (goto-char (point-max)) + (while (and (setq openp (memq (process-status process) + '(open run))) + (not (re-search-backward + (format "^%d .*\n" sequence) + (if nnimap-streaming + (max (point-min) (- (point) 500)) + (point-min)) + t))) + (when messagep + (message "nnimap read %dk" (/ (buffer-size) 1000))) + (nnheader-accept-process-output process) + (goto-char (point-max))) + openp) + (quit + ;; The user hit C-g while we were waiting: kill the process, in case + ;; it's a gnutls-cli process that's stuck (tends to happen a lot behind + ;; NAT routers). + (delete-process process) + nil)))) (defun nnimap-parse-response () (let ((lines (split-string (nnimap-last-response-string) "\r\n" t)) === modified file 'lisp/gnus/nnir.el' --- lisp/gnus/nnir.el 2010-10-10 00:15:21 +0000 +++ lisp/gnus/nnir.el 2010-10-10 22:48:40 +0000 @@ -339,23 +339,34 @@ (eval-when-compile (require 'cl)) + +(eval-when-compile + (autoload 'nnimap-buffer "nnimap") + (autoload 'nnimap-command "nnimap") + (autoload 'nnimap-possibly-change-group "nnimap")) + (nnoo-declare nnir) (nnoo-define-basics nnir) (gnus-declare-backend "nnir" 'mail) -(defvar nnir-imap-search-field "TEXT" - "The IMAP search item when doing an nnir search. To use raw - imap queries by default set this to \"\"") +(defvar nnir-imap-default-search-key "Whole message" + "The default IMAP search key for an nnir search. Must be one of + the keys in nnir-imap-search-arguments. To use raw imap queries + by default set this to \"Imap\"") (defvar nnir-imap-search-arguments '(("Whole message" . "TEXT") ("Subject" . "SUBJECT") ("To" . "TO") ("From" . "FROM") - ("Head" . "HEADER \"%s\"") - (nil . "")) - "Mapping from user readable strings to IMAP search items for use in nnir") + ("Imap" . "")) + "Mapping from user readable keys to IMAP search items for use in nnir") + +(defvar nnir-imap-search-other "HEADER %S" + "The IMAP search item to use for anything other than + nnir-imap-search-arguments. By default this is the name of an + email header field") (defvar nnir-imap-search-argument-history () "The history for querying search options in nnir") @@ -375,12 +386,12 @@ ()) (imap nnir-run-imap ((criteria - "Search in: " ; Prompt + "Search in" ; Prompt ,(mapcar 'car nnir-imap-search-arguments) ; alist for completing nil ; allow any user input nil ; initial value nnir-imap-search-argument-history ; the history to use - ,nnir-imap-search-field ; default + ,nnir-imap-default-search-key ; default ))) (swish++ nnir-run-swish++ ((group . "Group spec: "))) @@ -702,19 +713,30 @@ (let* ((cur (gnus-summary-article-number)) (group (nnir-artlist-artitem-group nnir-artlist cur)) (backend-number (nnir-artlist-artitem-number nnir-artlist cur)) - server backend-group) - (setq server (nnir-group-server group)) - (setq backend-group (gnus-group-real-name group)) - (gnus-group-read-ephemeral-group - backend-group - (gnus-server-to-method server) - t ; activate - (cons (current-buffer) - 'summary) ; window config - nil - (list backend-number)) - (gnus-summary-limit (list backend-number)) - (gnus-summary-refer-thread))) + (id (mail-header-id (gnus-summary-article-header))) + (refs (split-string + (mail-header-references (gnus-summary-article-header))))) + (if (string= (car (gnus-group-method group)) "nnimap") + (with-current-buffer (nnimap-buffer) + (let* ((cmd (let ((value + (format + "(OR HEADER REFERENCES %s HEADER Message-Id %s)" + id id))) + (dolist (refid refs value) + (setq value (format + "(OR (OR HEADER Message-Id %s HEADER REFERENCES %s) %s)" + refid refid value))))) + (result (nnimap-command + "UID SEARCH %s" cmd))) + (gnus-summary-read-group-1 group t t gnus-summary-buffer nil + (and (car result) + (delete 0 (mapcar #'string-to-number + (cdr (assoc "SEARCH" (cdr result))))))))) + (gnus-summary-read-group-1 group t t gnus-summary-buffer + nil (list backend-number)) + (gnus-summary-limit (list backend-number)) + (gnus-summary-refer-thread)))) + (if (fboundp 'eval-after-load) (eval-after-load "gnus-sum" @@ -936,22 +958,9 @@ ;; IMAP interface. ;; todo: -;; nnir invokes this two (2) times???! -;; we should not use nnimap at all but open our own server connection -;; we should not LIST * but use nnimap-list-pattern from defs ;; send queries as literals ;; handle errors -(autoload 'nnimap-open-server "nnimap") -(defvar nnimap-server-buffer) ;; nnimap.el -(autoload 'imap-mailbox-select "imap") -(autoload 'imap-search "imap") -(autoload 'imap-quote-specials "imap") - -(eval-when-compile - (autoload 'nnimap-buffer "nnimap") - (autoload 'nnimap-command "nnimap") - (autoload 'nnimap-possibly-change-group "nnimap")) (defun nnir-run-imap (query srv &optional group-option) "Run a search against an IMAP back-end server. @@ -963,7 +972,8 @@ (group (or group-option (gnus-group-group-name))) (defs (caddr (gnus-server-to-method srv))) (criteria (or (cdr (assq 'criteria query)) - nnir-imap-search-field)) + (cdr (assoc nnir-imap-default-search-key + nnir-imap-search-arguments)))) (gnus-inhibit-demon t) artlist) (message "Opening server %s" server) @@ -1044,7 +1054,7 @@ (cond ;; Simple string term ((stringp expr) - (format "%s \"%s\"" criteria (imap-quote-specials expr))) + (format "%s %S" criteria expr)) ;; Trivial term: and ((eq expr 'and) nil) ;; Composite term: or expression @@ -1580,7 +1590,7 @@ (if (listp prompt) (let* ((result (apply 'gnus-completing-read prompt)) (mapping (or (assoc result nnir-imap-search-arguments) - (assoc nil nnir-imap-search-arguments)))) + (cons nil nnir-imap-search-other)))) (cons sym (format (cdr mapping) result))) (cons sym (read-string prompt))))) ------------------------------------------------------------ revno: 101901 committer: Lars Magne Ingebrigtsen branch nick: trunk timestamp: Sun 2010-10-10 20:47:45 +0200 message: Fix gnutls write-before-negotiation case. * gnutls.c (emacs_gnutls_write): If we're trying to write before gnutls is ready, return EAGAIN as the errno. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-10 15:49:31 +0000 +++ src/ChangeLog 2010-10-10 18:47:45 +0000 @@ -1,3 +1,8 @@ +2010-10-10 Lars Magne Ingebrigtsen + + * gnutls.c (emacs_gnutls_write): If we're trying to write before + gnutls is ready, return EAGAIN as the errno. + 2010-10-10 Dan Nicolaescu * vm-limit.c: === modified file 'src/gnutls.c' --- src/gnutls.c 2010-10-09 13:54:57 +0000 +++ src/gnutls.c 2010-10-10 18:47:45 +0000 @@ -77,8 +77,15 @@ register int rtnval, bytes_written; gnutls_session_t state = proc->gnutls_state; - if (proc->gnutls_initstage != GNUTLS_STAGE_READY) + if (proc->gnutls_initstage != GNUTLS_STAGE_READY) { +#ifdef EWOULDBLOCK + errno = EWOULDBLOCK; +#endif +#ifdef EAGAIN + errno = EAGAIN; +#endif return -1; + } bytes_written = 0; ------------------------------------------------------------ revno: 101900 committer: Dan Nicolaescu branch nick: trunk timestamp: Sun 2010-10-10 08:49:31 -0700 message: Remove #ifdef emacs / #ifndef emacs code, unused. * src/vm-limit.c: * src/unexhp9k800.c: * src/unexelf.c: * src/unexaix.c: * src/termcap.c: Remove #ifdef emacs / #ifndef emacs code, unused. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-10 15:35:04 +0000 +++ src/ChangeLog 2010-10-10 15:49:31 +0000 @@ -1,5 +1,11 @@ 2010-10-10 Dan Nicolaescu + * vm-limit.c: + * unexhp9k800.c: + * unexelf.c: + * unexaix.c: + * termcap.c: Remove #ifdef emacs / #ifndef emacs code, unused. + * Makefile.in (temacs): Use $(ALL_CFLAGS) on the link line. (PROFILING_LDFLAGS): Remove, not needed anymore. === modified file 'src/termcap.c' --- src/termcap.c 2010-10-04 17:22:57 +0000 +++ src/termcap.c 2010-10-10 15:49:31 +0000 @@ -262,45 +262,20 @@ /* Outputting a string with padding. */ -#ifndef emacs -short ospeed; -/* If OSPEED is 0, we use this as the actual baud rate. */ -int tputs_baud_rate; -#endif - char PC; -#ifndef emacs -/* Actual baud rate if positive; - - baud rate / 100 if negative. */ - -static const int speeds[] = - { - 0, 50, 75, 110, 135, 150, -2, -3, -6, -12, - -18, -24, -48, -96, -192, -288, -384, -576, -1152 - }; - -#endif /* not emacs */ - void tputs (register char *str, int nlines, register int (*outfun) (/* ??? */)) { register int padcount = 0; register int speed; -#ifdef emacs extern EMACS_INT baud_rate; speed = baud_rate; /* For quite high speeds, convert to the smaller units to avoid overflow. */ if (speed > 10000) speed = - speed / 100; -#else - if (ospeed == 0) - speed = tputs_baud_rate; - else - speed = speeds[ospeed]; -#endif if (!str) return; === modified file 'src/unexaix.c' --- src/unexaix.c 2010-10-03 13:59:56 +0000 +++ src/unexaix.c 2010-10-10 15:49:31 +0000 @@ -40,13 +40,8 @@ * */ -#ifndef emacs -#define PERROR(arg) perror (arg); return -1 -#else #include #define PERROR(file) report_error (file, new) -#endif - #include /* Define getpagesize () if the system does not. Note that this may depend on symbols defined in a.out.h @@ -92,7 +87,6 @@ static int pagemask; -#ifdef emacs #include #include "lisp.h" @@ -103,7 +97,6 @@ close (fd); report_file_error ("Cannot unexec", Fcons (build_string (file), Qnil)); } -#endif /* emacs */ #define ERROR0(msg) report_error_1 (new, msg, 0, 0); return -1 #define ERROR1(msg,x) report_error_1 (new, msg, x, 0); return -1 @@ -113,12 +106,7 @@ report_error_1 (int fd, char *msg, int a1, int a2) { close (fd); -#ifdef emacs error (msg, a1, a2); -#else - fprintf (stderr, msg, a1, a2); - fprintf (stderr, "\n"); -#endif } static int make_hdr (int, int, unsigned, unsigned, unsigned, char *, char *); === modified file 'src/unexelf.c' --- src/unexelf.c 2010-10-03 13:59:56 +0000 +++ src/unexelf.c 2010-10-10 15:49:31 +0000 @@ -386,13 +386,8 @@ /* We do not use mmap because that fails with NFS. Instead we read the whole file, modify it, and write it out. */ -#ifndef emacs -#define fatal(a, b, c) fprintf (stderr, a, b, c), exit (1) -#include -#else #include extern void fatal (const char *msgid, ...); -#endif #include #include @@ -403,7 +398,7 @@ #include #if !defined (__NetBSD__) && !defined (__OpenBSD__) #include -#endif +#endif /* not __NetBSD__ and not __OpenBSD__ */ #include #if defined (_SYSTYPE_SYSV) #include @@ -1287,13 +1282,8 @@ /* Write out new_file, and free the buffers. */ if (write (new_file, new_base, new_file_size) != new_file_size) -#ifndef emacs - fatal ("Didn't write %d bytes: errno %d\n", - new_file_size, errno); -#else fatal ("Didn't write %d bytes to %s: errno %d\n", new_file_size, new_name, errno); -#endif munmap (old_base, old_file_size); munmap (new_base, new_file_size); === modified file 'src/unexhp9k800.c' --- src/unexhp9k800.c 2010-10-03 13:59:56 +0000 +++ src/unexhp9k800.c 2010-10-10 15:49:31 +0000 @@ -49,16 +49,11 @@ sigsetreturn (_sigreturn); */ -#ifdef emacs #include -#endif - #include #include #include - #include - #include /* brk value to restore, stored as a global. === modified file 'src/vm-limit.c' --- src/vm-limit.c 2010-07-29 06:59:29 +0000 +++ src/vm-limit.c 2010-10-10 15:49:31 +0000 @@ -17,12 +17,9 @@ You should have received a copy of the GNU General Public License along with GNU Emacs. If not, see . */ -#ifdef emacs #include #include #include "lisp.h" -#endif - #include "mem-limits.h" /* ------------------------------------------------------------ revno: 101899 committer: Dan Nicolaescu branch nick: trunk timestamp: Sun 2010-10-10 08:35:04 -0700 message: Pass CFLAGS to the linker. * configure.in (PROFILING_LDFLAGS): Do not define, remove all uses. * lib-src/Makefile.in (PROFILING_LDFLAGS): Remove, not needed. * msdos/sed1v2.inp (PROFILING_LDFLAGS): * msdos/sed3v2.inp (PROFILING_LDFLAGS): Remove, not defined anymore. * src/Makefile.in (temacs): Use $(ALL_CFLAGS) on the link line. (PROFILING_LDFLAGS): Remove, not needed anymore. diff: === modified file 'ChangeLog' --- ChangeLog 2010-10-09 18:46:57 +0000 +++ ChangeLog 2010-10-10 15:35:04 +0000 @@ -1,3 +1,7 @@ +2010-10-10 Dan Nicolaescu + + * configure.in (PROFILING_LDFLAGS): Do not define, remove all uses. + 2010-10-09 Glenn Morris * make-dist: No more doc/emacs/*.texi.in. === modified file 'configure' --- configure 2010-10-09 17:59:55 +0000 +++ configure 2010-10-10 15:35:04 +0000 @@ -749,7 +749,6 @@ build_vendor build_cpu build -PROFILING_LDFLAGS PROFILING_CFLAGS MAINT GZIP_INFO @@ -3038,14 +3037,11 @@ if test x$ac_enable_profiling != x ; then PROFILING_CFLAGS="-DPROFILING=1 -pg" - PROFILING_LDFLAGS="-pg" else PROFILING_CFLAGS= - PROFILING_LDFLAGS= fi - # Check whether --enable-autodepend was given. if test "${enable_autodepend+set}" = set; then : enableval=$enable_autodepend; ac_enable_autodepend="${enableval}" @@ -7679,7 +7675,7 @@ tmp_CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS -x objective-c" CFLAGS="$CFLAGS -x objective-c" -TEMACS_LDFLAGS2="\${LDFLAGS} \${PROFILING_LDFLAGS}" +TEMACS_LDFLAGS2="\${LDFLAGS}" if test "${with_ns}" != no; then if test "${opsys}" = darwin; then NS_IMPL_COCOA=yes === modified file 'configure.in' --- configure.in 2010-10-09 17:59:55 +0000 +++ configure.in 2010-10-10 15:35:04 +0000 @@ -325,13 +325,10 @@ [ac_enable_profiling="${enableval}"],[]) if test x$ac_enable_profiling != x ; then PROFILING_CFLAGS="-DPROFILING=1 -pg" - PROFILING_LDFLAGS="-pg" else PROFILING_CFLAGS= - PROFILING_LDFLAGS= fi AC_SUBST(PROFILING_CFLAGS) -AC_SUBST(PROFILING_LDFLAGS) AC_ARG_ENABLE(autodepend, [AS_HELP_STRING([--enable-autodepend], @@ -1487,7 +1484,7 @@ tmp_CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS -x objective-c" CFLAGS="$CFLAGS -x objective-c" -TEMACS_LDFLAGS2="\${LDFLAGS} \${PROFILING_LDFLAGS}" +TEMACS_LDFLAGS2="\${LDFLAGS}" dnl I don't think it's especially important, but src/Makefile.in dnl (now the only user of ns_appdir) used to go to the trouble of adding a dnl trailing "/" to it, so now we do it here. === modified file 'lib-src/ChangeLog' --- lib-src/ChangeLog 2010-10-09 01:15:15 +0000 +++ lib-src/ChangeLog 2010-10-10 15:35:04 +0000 @@ -1,3 +1,7 @@ +2010-10-10 Dan Nicolaescu + + * Makefile.in (PROFILING_LDFLAGS): Remove, not needed. + 2010-10-09 Glenn Morris * b2m.c, b2m.pl: Remove files. === modified file 'lib-src/Makefile.in' --- lib-src/Makefile.in 2010-10-09 01:15:15 +0000 +++ lib-src/Makefile.in 2010-10-10 15:35:04 +0000 @@ -39,7 +39,6 @@ C_SWITCH_MACHINE=@C_SWITCH_MACHINE@ C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ PROFILING_CFLAGS = @PROFILING_CFLAGS@ -PROFILING_LDFLAGS = @PROFILING_LDFLAGS@ # Program name transformation. TRANSFORM = @program_transform_name@ @@ -173,7 +172,7 @@ -DHAVE_CONFIG_H -I. -I../src -I${srcdir} -I${srcdir}/../src ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} -LINK_CFLAGS = ${BASE_CFLAGS} ${PROFILING_LDFLAGS} ${LDFLAGS} ${CFLAGS} +LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} LOADLIBES=$(LIBS_SYSTEM) === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2010-10-10 13:39:03 +0000 +++ msdos/ChangeLog 2010-10-10 15:35:04 +0000 @@ -1,3 +1,8 @@ +2010-10-10 Dan Nicolaescu + + * sed1v2.inp (PROFILING_LDFLAGS): + * sed3v2.inp (PROFILING_LDFLAGS): Remove, not defined anymore. + 2010-10-09 Glenn Morris * mainmake.v2 (install): Remove b2m. === modified file 'msdos/sed1v2.inp' --- msdos/sed1v2.inp 2010-10-01 19:20:29 +0000 +++ msdos/sed1v2.inp 2010-10-10 15:35:04 +0000 @@ -43,7 +43,6 @@ /^C_SWITCH_X_SITE *=/s/@C_SWITCH_X_SITE@// /^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@// /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@// -/^PROFILING_LDFLAGS *=/s/@PROFILING_LDFLAGS@// #/^LD_SWITCH_X_SITE *=/s/@LD_SWITCH_X_SITE@// /^LD_SWITCH_SYSTEM_TEMACS *=/s/@LD_SWITCH_SYSTEM_TEMACS@// /^LD_SWITCH_X_SITE_AUX *=/s/@LD_SWITCH_X_SITE_AUX@// === modified file 'msdos/sed3v2.inp' --- msdos/sed3v2.inp 2010-07-12 18:23:00 +0000 +++ msdos/sed3v2.inp 2010-10-10 15:35:04 +0000 @@ -41,7 +41,6 @@ /^C_SWITCH_MACHINE *=/s/@C_SWITCH_MACHINE@// /^C_WARNINGS_SWITCH *=/s/@C_WARNINGS_SWITCH@// /^PROFILING_CFLAGS *=/s/@PROFILING_CFLAGS@// -/^PROFILING_LDFLAGS *=/s/@PROFILING_LDFLAGS@// /^LOADLIBES *=/s!=.*$!=! /^ALLOCA *=/s!@ALLOCA@!! /^EXEEXT *=/s!@EXEEXT@!! === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-10 14:47:43 +0000 +++ src/ChangeLog 2010-10-10 15:35:04 +0000 @@ -1,5 +1,8 @@ 2010-10-10 Dan Nicolaescu + * Makefile.in (temacs): Use $(ALL_CFLAGS) on the link line. + (PROFILING_LDFLAGS): Remove, not needed anymore. + * Makefile.in: Use $(...) everywhere instead of ${...} (CRT_DIR): Move near potential user. (START_FILE): Move near CRT_DIR, it might use it. === modified file 'src/Makefile.in' --- src/Makefile.in 2010-10-10 14:47:43 +0000 +++ src/Makefile.in 2010-10-10 15:35:04 +0000 @@ -65,7 +65,6 @@ ## Flags to pass for profiling builds PROFILING_CFLAGS = @PROFILING_CFLAGS@ -PROFILING_LDFLAGS = @PROFILING_LDFLAGS@ ## Flags to pass to the compiler to enable build warnings C_WARNINGS_SWITCH = @C_WARNINGS_SWITCH@ @@ -114,7 +113,7 @@ ## Flags to pass to ld only for temacs. TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS) -## $LDFLAGS $PROFILING_LDFLAGS, or empty if NS_IMPL_GNUSTEP (for some reason). +## $LDFLAGS or empty if NS_IMPL_GNUSTEP (for some reason). TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@ ## Some systems define this to request special libraries. @@ -648,7 +647,7 @@ temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) - $(CC) $(LD_FIRSTFLAG) $(TEMACS_LDFLAGS) $(TEMACS_LDFLAGS2) \ + $(CC) $(LD_FIRSTFLAG) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(TEMACS_LDFLAGS2) \ -o temacs $(START_FILES) $(obj) $(otherobj) $(LIBES) ## The following oldxmenu-related rules are only (possibly) used if ------------------------------------------------------------ revno: 101898 committer: Dan Nicolaescu branch nick: trunk timestamp: Sun 2010-10-10 07:47:43 -0700 message: * src/Makefile.in (CRT_DIR): Move near potential user. (START_FILE): Move near CRT_DIR, it might use it. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-10 14:43:05 +0000 +++ src/ChangeLog 2010-10-10 14:47:43 +0000 @@ -1,6 +1,8 @@ 2010-10-10 Dan Nicolaescu * Makefile.in: Use $(...) everywhere instead of ${...} + (CRT_DIR): Move near potential user. + (START_FILE): Move near CRT_DIR, it might use it. * sysdep.c (LPASS8): Remove, unused. (emacs_ospeed): Change from being a global to a local in the only === modified file 'src/Makefile.in' --- src/Makefile.in 2010-10-10 14:43:05 +0000 +++ src/Makefile.in 2010-10-10 14:47:43 +0000 @@ -64,8 +64,6 @@ OTHER_FILES = @OTHER_FILES@ ## Flags to pass for profiling builds -CRT_DIR=@CRT_DIR@ - PROFILING_CFLAGS = @PROFILING_CFLAGS@ PROFILING_LDFLAGS = @PROFILING_LDFLAGS@ @@ -125,8 +123,10 @@ ## Where to find libgcc.a, if using gcc and necessary. LIB_GCC=@LIB_GCC@ +CRT_DIR=@CRT_DIR@ ## May use $CRT_DIR. LIB_STANDARD=@LIB_STANDARD@ +START_FILES = @START_FILES@ ## -lm, or empty. LIB_MATH=@LIB_MATH@ @@ -295,8 +295,6 @@ RUN_TEMACS = `/bin/pwd`/temacs -START_FILES = @START_FILES@ - UNEXEC_OBJ = @UNEXEC_OBJ@ CANNOT_DUMP=@CANNOT_DUMP@ ------------------------------------------------------------ revno: 101897 committer: Dan Nicolaescu branch nick: trunk timestamp: Sun 2010-10-10 07:43:05 -0700 message: * src/Makefile.in: Use $(...) everywhere instead of ${...} diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-10 13:44:22 +0000 +++ src/ChangeLog 2010-10-10 14:43:05 +0000 @@ -1,5 +1,7 @@ 2010-10-10 Dan Nicolaescu + * Makefile.in: Use $(...) everywhere instead of ${...} + * sysdep.c (LPASS8): Remove, unused. (emacs_ospeed): Change from being a global to a local in the only user: init_baud_rate. === modified file 'src/Makefile.in' --- src/Makefile.in 2010-09-30 01:20:51 +0000 +++ src/Makefile.in 2010-10-10 14:43:05 +0000 @@ -46,7 +46,7 @@ # LIBS = @LIBS@ LIBOBJS = @LIBOBJS@ -lispsource = ${srcdir}/../lisp/ +lispsource = $(srcdir)/../lisp/ libsrc = ../lib-src/ etc = ../etc/ oldXMenudir = ../oldXMenu/ @@ -54,18 +54,18 @@ lispdir = ../lisp/ # Configuration files for .o files to depend on. -M_FILE = ${srcdir}/@machfile@ -S_FILE = ${srcdir}/@opsysfile@ +M_FILE = $(srcdir)/@machfile@ +S_FILE = $(srcdir)/@opsysfile@ config_h = config.h $(M_FILE) $(S_FILE) -bootstrap_exe = ${abs_builddir}/bootstrap-emacs${EXEEXT} +bootstrap_exe = $(abs_builddir)/bootstrap-emacs$(EXEEXT) ## ns-app if HAVE_NS, else empty. OTHER_FILES = @OTHER_FILES@ +## Flags to pass for profiling builds CRT_DIR=@CRT_DIR@ -## Flags to pass for profiling builds PROFILING_CFLAGS = @PROFILING_CFLAGS@ PROFILING_LDFLAGS = @PROFILING_LDFLAGS@ @@ -177,8 +177,8 @@ OLDXMENU_TARGET=@OLDXMENU_TARGET@ ## If !HAVE_X11 || USE_GTK, empty. -## Else if USE_X_TOOLKIT, ${lwlibdir}liblw.a. -## Else ${oldXMenudir}libXMenu11.a. +## Else if USE_X_TOOLKIT, $(lwlibdir)liblw.a. +## Else $(oldxmenudir)libXMenu11.a. ## (Actually, rather than being empty, it is set to "nothing". ## It is never actually used for anything in this case. ## This is done because there is a rule with target $(OLDXMENU) below, @@ -188,7 +188,7 @@ ## The alternative would be to put that rule in a makefile fragment.) OLDXMENU=@OLDXMENU@ -## If HAVE_X11 && !USE_GTK, ${OLDXMENU} ../src/${OLDXMENU}; else empty. +## If HAVE_X11 && !USE_GTK, $(OLDXMENU) ../src/$(OLDXMENU); else empty. ## We use stamp-xmenu with these two deps to both ensure that lwlib ## gets remade based on its dependencies in its own makefile, ## and remake temacs if lwlib gets changed by this. @@ -238,9 +238,9 @@ MSDOS_OBJ = ## w16select.o termcap.o if MSDOS && HAVE_X_WINDOWS. MSDOS_X_OBJ = -MSDOS_SUPPORT_REAL = ${lispsource}ls-lisp.elc ${lispsource}disp-table.elc \ - ${lispsource}dos-fns.elc ${lispsource}dos-w32.elc ${lispsource}dos-vars.elc \ - ${lispsource}term/internal.elc ${lispsource}term/pc-win.elc +MSDOS_SUPPORT_REAL = $(lispsource)ls-lisp.elc $(lispsource)disp-table.elc \ + $(lispsource)dos-fns.elc $(lispsource)dos-w32.elc $(lispsource)dos-vars.elc \ + $(lispsource)term/internal.elc $(lispsource)term/pc-win.elc ## $MSDOS_SUPPORT_REAL if MSDOS. MSDOS_SUPPORT = @@ -259,23 +259,23 @@ FONT_OBJ=@FONT_OBJ@ ## Used if HAVE_MOUSE. -REAL_MOUSE_SUPPORT=${lispsource}mouse.elc ${lispsource}select.elc \ - ${lispsource}scroll-bar.elc +REAL_MOUSE_SUPPORT=$(lispsource)mouse.elc $(lispsource)select.elc \ + $(lispsource)scroll-bar.elc ## Used if HAVE_GPM && !HAVE_MOUSE -GPM_MOUSE_SUPPORT=${lispsource}mouse.elc +GPM_MOUSE_SUPPORT=$(lispsource)mouse.elc LIBGPM = @LIBGPM@ ## Either of the two preceding options, or empty. MOUSE_SUPPORT=@MOUSE_SUPPORT@ -## ${lispsource}tooltip.elc if HAVE_WINDOW_SYSTEM, else empty. +## $(lispsource)tooltip.elc if HAVE_WINDOW_SYSTEM, else empty. TOOLTIP_SUPPORT=@TOOLTIP_SUPPORT@ -BASE_WINDOW_SUPPORT=${lispsource}fringe.elc ${lispsource}image.elc \ - ${lispsource}international/fontset.elc ${lispsource}dnd.elc \ - ${lispsource}tool-bar.elc ${lispsource}mwheel.elc +BASE_WINDOW_SUPPORT=$(lispsource)fringe.elc $(lispsource)image.elc \ + $(lispsource)international/fontset.elc $(lispsource)dnd.elc \ + $(lispsource)tool-bar.elc $(lispsource)mwheel.elc -X_WINDOW_SUPPORT=${lispsource}x-dnd.elc ${lispsource}term/common-win.elc \ - ${lispsource}term/x-win.elc ${lispsource}dynamic-setting.elc +X_WINDOW_SUPPORT=$(lispsource)x-dnd.elc $(lispsource)term/common-win.elc \ + $(lispsource)term/x-win.elc $(lispsource)dynamic-setting.elc ## If HAVE_X_WINDOWS, both the above ## else if HAVE_WINDOW_SYSTEM (ie, HAVE_NS) just the former; else empty. @@ -302,9 +302,9 @@ CANNOT_DUMP=@CANNOT_DUMP@ DEPDIR=deps -## -MMD -MF ${DEPDIR}/$*.d if AUTO_DEPEND; else empty. +## -MMD -MF $(DEPDIR)/$*.d if AUTO_DEPEND; else empty. DEPFLAGS=@DEPFLAGS@ -## test -d ${DEPDIR} || mkdir ${DEPDIR} (if AUTO_DEPEND); else ':'. +## test -d $(DEPDIR) || mkdir $(DEPDIR) (if AUTO_DEPEND); else ':'. MKDEPDIR=@MKDEPDIR@ ## DO NOT use -R. There is a special hack described in lastfile.c @@ -322,14 +322,14 @@ ## since it may have -I options that should override those. ## ## FIXME? MYCPPFLAGS only referenced in etc/DEBUG. -ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I${srcdir} \ - ${C_SWITCH_MACHINE} ${C_SWITCH_SYSTEM} ${C_SWITCH_X_SITE} \ - ${C_SWITCH_X_SYSTEM} ${CFLAGS_SOUND} ${RSVG_CFLAGS} ${IMAGEMAGICK_CFLAGS} \ - ${LIBXML2_CFLAGS} ${DBUS_CFLAGS} \ - ${GCONF_CFLAGS} ${FREETYPE_CFLAGS} ${FONTCONFIG_CFLAGS} \ - ${LIBOTF_CFLAGS} ${M17N_FLT_CFLAGS} ${DEPFLAGS} ${PROFILING_CFLAGS} \ +ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I$(srcdir) \ + $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ + $(C_SWITCH_X_SYSTEM) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \ + $(LIBXML2_CFLAGS) $(DBUS_CFLAGS) \ + $(GCONF_CFLAGS) $(FREETYPE_CFLAGS) $(FONTCONFIG_CFLAGS) \ + $(LIBOTF_CFLAGS) $(M17N_FLT_CFLAGS) $(DEPFLAGS) $(PROFILING_CFLAGS) \ $(LIBGNUTLS_CFLAGS) \ - ${C_WARNINGS_SWITCH} ${CFLAGS} + $(C_WARNINGS_SWITCH) $(CFLAGS) ALL_OBJC_CFLAGS=$(ALL_CFLAGS) $(GNU_OBJC_CFLAGS) .SUFFIXES: .m @@ -400,93 +400,93 @@ ## Place loaddefs.el first, so it gets generated first, since it is on ## the critical path (relevant in parallel compilations). lisp= \ - ${lispsource}loaddefs.el \ - ${lispsource}abbrev.elc \ - ${lispsource}buff-menu.elc \ - ${lispsource}button.elc \ - ${lispsource}emacs-lisp/byte-run.elc \ - ${lispsource}composite.elc \ - ${lispsource}cus-face.elc \ - ${lispsource}cus-start.elc \ - ${lispsource}custom.elc \ - ${lispsource}emacs-lisp/backquote.elc \ - ${lispsource}emacs-lisp/lisp-mode.elc \ - ${lispsource}emacs-lisp/lisp.elc \ - ${lispsource}env.elc \ - ${lispsource}faces.elc \ - ${lispsource}files.elc \ - ${lispsource}format.elc \ - ${lispsource}facemenu.elc \ - ${MOUSE_SUPPORT} \ - ${lispsource}emacs-lisp/float-sup.elc \ - ${lispsource}frame.elc \ - ${lispsource}help.elc \ - ${lispsource}indent.elc \ - ${lispsource}isearch.elc \ - ${lispsource}rfn-eshadow.elc \ - ${lispsource}loadup.el \ - ${lispsource}bindings.elc \ - ${lispsource}emacs-lisp/map-ynp.elc \ - ${lispsource}menu-bar.elc \ - ${lispsource}international/mule.elc \ - ${lispsource}international/mule-conf.elc \ - ${lispsource}international/mule-cmds.elc \ - ${lispsource}international/characters.elc \ - ${lispsource}international/charprop.el \ - ${lispsource}case-table.elc \ - ${lispsource}language/chinese.elc \ - ${lispsource}language/cyrillic.elc \ - ${lispsource}language/indian.elc \ - ${lispsource}language/sinhala.el \ - ${lispsource}language/english.el \ - ${lispsource}language/ethiopic.elc \ - ${lispsource}language/european.elc \ - ${lispsource}language/czech.el \ - ${lispsource}language/slovak.el \ - ${lispsource}language/romanian.el \ - ${lispsource}language/greek.el \ - ${lispsource}language/hebrew.elc \ - ${lispsource}language/japanese.el \ - ${lispsource}language/korean.el \ - ${lispsource}language/lao.el \ - ${lispsource}language/cham.el \ - ${lispsource}language/tai-viet.el \ - ${lispsource}language/thai.el \ - ${lispsource}language/tibetan.elc \ - ${lispsource}language/vietnamese.elc \ - ${lispsource}language/misc-lang.el \ - ${lispsource}language/utf-8-lang.el \ - ${lispsource}language/georgian.el \ - ${lispsource}language/khmer.el \ - ${lispsource}language/burmese.el \ - ${lispsource}paths.el \ - ${lispsource}register.elc \ - ${lispsource}replace.elc \ - ${lispsource}simple.elc \ - ${lispsource}minibuffer.elc \ - ${lispsource}startup.elc \ - ${lispsource}subr.elc \ - ${lispsource}term/tty-colors.elc \ - ${lispsource}font-core.elc \ - ${lispsource}emacs-lisp/syntax.elc \ - ${lispsource}font-lock.elc \ - ${lispsource}jit-lock.elc \ - ${lispsource}textmodes/fill.elc \ - ${lispsource}textmodes/page.elc \ - ${lispsource}textmodes/paragraphs.elc \ - ${lispsource}textmodes/text-mode.elc \ - ${lispsource}emacs-lisp/timer.elc \ - ${lispsource}jka-cmpr-hook.elc \ - ${lispsource}vc/vc-hooks.elc \ - ${lispsource}vc/ediff-hook.elc \ - ${lispsource}epa-hook.elc \ - ${TOOLTIP_SUPPORT} \ - ${MSDOS_SUPPORT} \ - ${WINDOW_SUPPORT} \ - ${NS_SUPPORT} \ - ${lispsource}widget.elc \ - ${lispsource}window.elc \ - ${lispsource}version.el + $(lispsource)loaddefs.el \ + $(lispsource)abbrev.elc \ + $(lispsource)buff-menu.elc \ + $(lispsource)button.elc \ + $(lispsource)emacs-lisp/byte-run.elc \ + $(lispsource)composite.elc \ + $(lispsource)cus-face.elc \ + $(lispsource)cus-start.elc \ + $(lispsource)custom.elc \ + $(lispsource)emacs-lisp/backquote.elc \ + $(lispsource)emacs-lisp/lisp-mode.elc \ + $(lispsource)emacs-lisp/lisp.elc \ + $(lispsource)env.elc \ + $(lispsource)faces.elc \ + $(lispsource)files.elc \ + $(lispsource)format.elc \ + $(lispsource)facemenu.elc \ + $(MOUSE_SUPPORT) \ + $(lispsource)emacs-lisp/float-sup.elc \ + $(lispsource)frame.elc \ + $(lispsource)help.elc \ + $(lispsource)indent.elc \ + $(lispsource)isearch.elc \ + $(lispsource)rfn-eshadow.elc \ + $(lispsource)loadup.el \ + $(lispsource)bindings.elc \ + $(lispsource)emacs-lisp/map-ynp.elc \ + $(lispsource)menu-bar.elc \ + $(lispsource)international/mule.elc \ + $(lispsource)international/mule-conf.elc \ + $(lispsource)international/mule-cmds.elc \ + $(lispsource)international/characters.elc \ + $(lispsource)international/charprop.el \ + $(lispsource)case-table.elc \ + $(lispsource)language/chinese.elc \ + $(lispsource)language/cyrillic.elc \ + $(lispsource)language/indian.elc \ + $(lispsource)language/sinhala.el \ + $(lispsource)language/english.el \ + $(lispsource)language/ethiopic.elc \ + $(lispsource)language/european.elc \ + $(lispsource)language/czech.el \ + $(lispsource)language/slovak.el \ + $(lispsource)language/romanian.el \ + $(lispsource)language/greek.el \ + $(lispsource)language/hebrew.elc \ + $(lispsource)language/japanese.el \ + $(lispsource)language/korean.el \ + $(lispsource)language/lao.el \ + $(lispsource)language/cham.el \ + $(lispsource)language/tai-viet.el \ + $(lispsource)language/thai.el \ + $(lispsource)language/tibetan.elc \ + $(lispsource)language/vietnamese.elc \ + $(lispsource)language/misc-lang.el \ + $(lispsource)language/utf-8-lang.el \ + $(lispsource)language/georgian.el \ + $(lispsource)language/khmer.el \ + $(lispsource)language/burmese.el \ + $(lispsource)paths.el \ + $(lispsource)register.elc \ + $(lispsource)replace.elc \ + $(lispsource)simple.elc \ + $(lispsource)minibuffer.elc \ + $(lispsource)startup.elc \ + $(lispsource)subr.elc \ + $(lispsource)term/tty-colors.elc \ + $(lispsource)font-core.elc \ + $(lispsource)emacs-lisp/syntax.elc \ + $(lispsource)font-lock.elc \ + $(lispsource)jit-lock.elc \ + $(lispsource)textmodes/fill.elc \ + $(lispsource)textmodes/page.elc \ + $(lispsource)textmodes/paragraphs.elc \ + $(lispsource)textmodes/text-mode.elc \ + $(lispsource)emacs-lisp/timer.elc \ + $(lispsource)jka-cmpr-hook.elc \ + $(lispsource)vc/vc-hooks.elc \ + $(lispsource)vc/ediff-hook.elc \ + $(lispsource)epa-hook.elc \ + $(TOOLTIP_SUPPORT) \ + $(MSDOS_SUPPORT) \ + $(WINDOW_SUPPORT) \ + $(NS_SUPPORT) \ + $(lispsource)widget.elc \ + $(lispsource)window.elc \ + $(lispsource)version.el ## List of relative names for those files from $lisp that are loaded ## unconditionally (i.e. on all platforms). Files from $lisp that @@ -601,80 +601,80 @@ ## duplicated symbols. If the standard libraries were compiled ## with GCC, we might need LIB_GCC again after them. LIBES = $(LIBS) $(LIBX_BASE) $(LIBX_OTHER) $(LIBSOUND) \ - $(RSVG_LIBS) ${IMAGEMAGICK_LIBS} $(DBUS_LIBS) \ - ${LIBXML2_LIBS} $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ - $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) ${GCONF_LIBS} ${LIBSELINUX_LIBS} \ + $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(DBUS_LIBS) \ + $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \ + $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(GCONF_LIBS) $(LIBSELINUX_LIBS) \ $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \ $(LIBGNUTLS_LIBS) \ $(LIB_GCC) $(LIB_MATH) $(LIB_STANDARD) $(LIB_GCC) -all: emacs${EXEEXT} $(OTHER_FILES) +all: emacs$(EXEEXT) $(OTHER_FILES) ## Does anyone ever pay attention to the load-path-shadows output here? ## The dumped Emacs is as functional and more efficient than ## bootstrap-emacs, so we replace the latter with the former. -emacs${EXEEXT}: temacs${EXEEXT} ${etc}DOC ${lisp} - if test "${CANNOT_DUMP}" = "yes"; then \ - ln -f temacs${EXEEXT} emacs${EXEEXT}; \ - EMACSLOADPATH=${lispsource} ./emacs -q -batch \ +emacs$(EXEEXT): temacs$(EXEEXT) $(etc)DOC $(lisp) + if test "$(CANNOT_DUMP)" = "yes"; then \ + ln -f temacs$(EXEEXT) emacs$(EXEEXT); \ + EMACSLOADPATH=$(lispsource) ./emacs -q -batch \ -f list-load-path-shadows || true; \ else \ LC_ALL=C $(RUN_TEMACS) -batch -l loadup dump || exit 1; \ - ln -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}; \ + ln -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ ./emacs -q -batch -f list-load-path-shadows || true; \ fi ## We run make-docfile twice because the command line may get too long ## on some systems. -## ${SOME_MACHINE_OBJECTS} comes before ${obj} because some files may -## or may not be included in ${obj}, but they are always included in -## ${SOME_MACHINE_OBJECTS}. Since a file is processed when it is mentioned +## $(SOME_MACHINE_OBJECTS) comes before $(obj) because some files may +## or may not be included in $(obj), but they are always included in +## $(SOME_MACHINE_OBJECTS). Since a file is processed when it is mentioned ## for the first time, this prevents any variation between configurations ## in the contents of the DOC file. -## Likewise for ${SOME_MACHINE_LISP}. -## Most of this Makefile refers to Lisp files via ${lispsource}, so -## we also use ${lisp} rather than ${shortlisp} for the dependency since +## Likewise for $(SOME_MACHINE_LISP). +## Most of this Makefile refers to Lisp files via $(lispsource), so +## we also use $(lisp) rather than $(shortlisp) for the dependency since ## the Makefile uses string equality to decide when we talk about identical -## files. Apparently we pass ${shortlisp} rather than ${lisp} to make-docfile +## files. Apparently we pass $(shortlisp) rather than $(lisp) to make-docfile ## only in order to reduce the command line length. --Stef -${etc}DOC: ${libsrc}make-docfile${EXEEXT} ${obj} ${lisp} ${SOME_MACHINE_LISP} - -rm -f ${etc}DOC - ${libsrc}make-docfile -d ${srcdir} ${SOME_MACHINE_OBJECTS} ${obj} > ${etc}DOC - ${libsrc}make-docfile -a ${etc}DOC -d ${srcdir} ${SOME_MACHINE_LISP} ${shortlisp} +$(etc)DOC: $(libsrc)make-docfile$(EXEEXT) $(obj) $(lisp) $(SOME_MACHINE_LISP) + -rm -f $(etc)DOC + $(libsrc)make-docfile -d $(srcdir) $(SOME_MACHINE_OBJECTS) $(obj) > $(etc)DOC + $(libsrc)make-docfile -a $(etc)DOC -d $(srcdir) $(SOME_MACHINE_LISP) $(shortlisp) -${libsrc}make-docfile${EXEEXT}: - cd ${libsrc}; ${MAKE} ${MFLAGS} make-docfile${EXEEXT} +$(libsrc)make-docfile$(EXEEXT): + cd $(libsrc); $(MAKE) $(MFLAGS) make-docfile$(EXEEXT) buildobj.h: Makefile - echo "#define BUILDOBJ \"${obj} ${otherobj} " "\"" > buildobj.h - - -temacs${EXEEXT}: $(START_FILES) stamp-oldxmenu ${obj} ${otherobj} - $(CC) $(LD_FIRSTFLAG) ${TEMACS_LDFLAGS} ${TEMACS_LDFLAGS2} \ - -o temacs ${START_FILES} ${obj} ${otherobj} ${LIBES} + echo "#define BUILDOBJ \"$(obj) $(otherobj) " "\"" > buildobj.h + + +temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) + $(CC) $(LD_FIRSTFLAG) $(TEMACS_LDFLAGS) $(TEMACS_LDFLAGS2) \ + -o temacs $(START_FILES) $(obj) $(otherobj) $(LIBES) ## The following oldxmenu-related rules are only (possibly) used if ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them ## (provided we take a little care that OLDXMENU is never empty). really-lwlib: - cd ${lwlibdir}; ${MAKE} ${MFLAGS} \ - CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' + cd $(lwlibdir); $(MAKE) $(MFLAGS) \ + CC='$(CC)' CFLAGS='$(CFLAGS)' MAKE='$(MAKE)' @true # make -t should not create really-lwlib. .PHONY: really-lwlib really-oldXMenu: - cd ${oldXMenudir}; ${MAKE} ${MFLAGS} \ - CC='${CC}' CFLAGS='${CFLAGS}' MAKE='${MAKE}' + cd $(oldxmenudir); $(MAKE) $(MFLAGS) \ + CC='$(CC)' CFLAGS='$(CFLAGS)' MAKE='$(MAKE)' @true # make -t should not create really-oldXMenu. .PHONY: really-oldXMenu ## We do not really need this when OLDXMENU_DEPS is empty, but as ## things stand we need something to satisfy the temacs dependency. -stamp-oldxmenu: ${OLDXMENU_DEPS} +stamp-oldxmenu: $(OLDXMENU_DEPS) touch stamp-oldxmenu ## Supply an ordering for parallel make. -../src/$(OLDXMENU): ${OLDXMENU} +../src/$(OLDXMENU): $(OLDXMENU) $(OLDXMENU): $(OLDXMENU_TARGET) @@ -696,14 +696,14 @@ mostlyclean: - rm -f temacs${EXEEXT} core *.core \#* *.o libXMenu11.a liblw.a + rm -f temacs$(EXEEXT) core *.core \#* *.o libXMenu11.a liblw.a rm -f ../etc/DOC - rm -f bootstrap-emacs${EXEEXT} emacs-${version}${EXEEXT} + rm -f bootstrap-emacs$(EXEEXT) emacs-$(version)$(EXEEXT) rm -f buildobj.h clean: mostlyclean - rm -f emacs-*.*.*${EXEEXT} emacs${EXEEXT} - -rm -rf ${DEPDIR} - test "X${ns_appdir}" = "X" || rm -rf ${ns_appdir} + rm -f emacs-*.*.*$(EXEEXT) emacs$(EXEEXT) + -rm -rf $(DEPDIR) + test "X$(ns_appdir)" = "X" || rm -rf $(ns_appdir) ## bootstrap-clean is used to clean up just before a bootstrap. ## It should remove all files generated during a compilation/bootstrap, @@ -712,7 +712,7 @@ rm -f epaths.h config.h config.stamp stamp-oldxmenu ../etc/DOC-* if test -f ./.gdbinit; then \ mv ./.gdbinit ./.gdbinit.save; \ - if test -f "${srcdir}/.gdbinit"; then rm -f ./.gdbinit.save; \ + if test -f "$(srcdir)/.gdbinit"; then rm -f ./.gdbinit.save; \ else mv ./.gdbinit.save ./.gdbinit; fi; \ fi ## This is used in making a distribution. @@ -724,7 +724,7 @@ @echo "it deletes files that may require special tools to rebuild." rm -f TAGS versionclean: - -rm -f emacs${EXEEXT} emacs-*.*.*${EXEEXT} ../etc/DOC* + -rm -f emacs$(EXEEXT) emacs-*.*.*$(EXEEXT) ../etc/DOC* extraclean: distclean -rm -f *~ \#* m/?*~ s/?*~ @@ -735,12 +735,12 @@ ctagsfiles2 = [a-wA-W]*.[hcm] TAGS: $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) - ../lib-src/etags --include=TAGS-LISP --include=${lwlibdir}/TAGS \ + ../lib-src/etags --include=TAGS-LISP --include=$(lwlibdir)/TAGS \ --regex='/[ ]*DEFVAR_[A-Z_ (]+"\([^"]+\)"/' \ $(srcdir)/$(ctagsfiles1) $(srcdir)/$(ctagsfiles2) frc: TAGS-LISP: frc - $(MAKE) -f ${lispdir}Makefile TAGS-LISP ETAGS=../lib-src/etags + $(MAKE) -f $(lispdir)Makefile TAGS-LISP ETAGS=../lib-src/etags $(lwlibdir)TAGS: (cd $(lwlibdir); $(MAKE) -f $(lwlibdir)Makefile tags ETAGS=../lib-src/etags) @@ -767,10 +767,10 @@ ## it), so it was compiled in parallel, leading typically to having 2 ## processes dumping bootstrap-emacs at the same time). ## So instead, we replace the witness-emacs dependencies by conditional -## bootstrap-dependencies (via ${BOOTSTRAPEMACS}). Of course, since we do +## bootstrap-dependencies (via $(BOOTSTRAPEMACS)). Of course, since we do ## not want to rely on GNU Make features, we have to rely on an external ## script to do the conditional part of the dependency -## (i.e. see the ${SUBDIR} rule ../Makefile.in). +## (i.e. see the $(SUBDIR) rule ../Makefile.in). .SUFFIXES: .elc .el @@ -780,28 +780,28 @@ ## With GNU Make, we would just say "%.el : %.elc $(BOOTSTRAPEMACS)" .el.elc: @cd ../lisp; $(MAKE) $(MFLAGS) compile-onefile \ - THEFILE=$< EMACS=${bootstrap_exe} + THEFILE=$< EMACS=$(bootstrap_exe) ## Since the .el.elc rule cannot specify an extra dependency, we do it here. -${lisp} ${SOME_MACHINE_LISP}: $(BOOTSTRAPEMACS) +$(lisp) $(SOME_MACHINE_LISP): $(BOOTSTRAPEMACS) ## VCSWITNESS points to the file that holds info about the current checkout. ## We use it as a heuristic to decide when to rebuild loaddefs.el. -${lispsource}loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS) - cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS=${bootstrap_exe} +$(lispsource)loaddefs.el: $(BOOTSTRAPEMACS) $(VCSWITNESS) + cd ../lisp; $(MAKE) $(MFLAGS) autoloads EMACS=$(bootstrap_exe) ## Dump an Emacs executable named bootstrap-emacs containing the ## files from loadup.el in source form. -bootstrap-emacs${EXEEXT}: temacs${EXEEXT} +bootstrap-emacs$(EXEEXT): temacs$(EXEEXT) cd ../lisp; $(MAKE) $(MFLAGS) update-subdirs - if test "${CANNOT_DUMP}" = "yes"; then \ - ln -f temacs${EXEEXT} bootstrap-emacs${EXEEXT}; \ + if test "$(CANNOT_DUMP)" = "yes"; then \ + ln -f temacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ else \ $(RUN_TEMACS) --batch --load loadup bootstrap || exit 1; \ - mv -f emacs${EXEEXT} bootstrap-emacs${EXEEXT}; \ + mv -f emacs$(EXEEXT) bootstrap-emacs$(EXEEXT); \ fi @: Compile some files earlier to speed up further compilation. - cd ../lisp; $(MAKE) $(MFLAGS) compile-first EMACS=${bootstrap_exe} + cd ../lisp; $(MAKE) $(MFLAGS) compile-first EMACS=$(bootstrap_exe) ## Insert either autodeps.mk (if AUTO_DEPEND), else deps.mk. @deps_frag@ ------------------------------------------------------------ revno: 101896 committer: Dan Nicolaescu branch nick: trunk timestamp: Sun 2010-10-10 06:44:22 -0700 message: Small sysdep.c cleanups. * src/sysdep.c (LPASS8): Remove, unused. (emacs_ospeed): Change from being a global to a local in the only user: init_baud_rate. diff: === modified file 'src/ChangeLog' --- src/ChangeLog 2010-10-09 14:31:56 +0000 +++ src/ChangeLog 2010-10-10 13:44:22 +0000 @@ -1,3 +1,9 @@ +2010-10-10 Dan Nicolaescu + + * sysdep.c (LPASS8): Remove, unused. + (emacs_ospeed): Change from being a global to a local in the only + user: init_baud_rate. + 2010-10-09 Lars Magne Ingebrigtsen * gnutls.c (syms_of_gnutls): All the bootprops are keywords. === modified file 'src/sysdep.c' --- src/sysdep.c 2010-10-03 15:19:34 +0000 +++ src/sysdep.c 2010-10-10 13:44:22 +0000 @@ -123,19 +123,12 @@ #endif #endif -/* LPASS8 is new in 4.3, and makes cbreak mode provide all 8 bits. */ -#ifndef LPASS8 -#define LPASS8 0 -#endif - static const int baud_convert[] = { 0, 50, 75, 110, 135, 150, 200, 300, 600, 1200, 1800, 2400, 4800, 9600, 19200, 38400 }; -int emacs_ospeed; - void croak (char *) NO_RETURN; /* Temporary used by `sigblock' when defined in terms of signprocmask. */ @@ -275,6 +268,8 @@ void init_baud_rate (int fd) { + int emacs_ospeed; + if (noninteractive) emacs_ospeed = 0; else ------------------------------------------------------------ revno: 101895 committer: Eli Zaretskii branch nick: trunk timestamp: Sun 2010-10-10 09:39:03 -0400 message: Rearrange an entry (test commit to bzr++ssh). diff: === modified file 'msdos/ChangeLog' --- msdos/ChangeLog 2010-10-09 01:15:15 +0000 +++ msdos/ChangeLog 2010-10-10 13:39:03 +0000 @@ -91,10 +91,10 @@ instead of lisp/version.el (see revno 100306). * sed1v2.inp (MKDEPDIR): Edit to empty. - Delete lines in rules that invoke $(MKDEPDIR). - Fix editing rules that begin with "cd ../lisp". - Edit out sh if-then-else-fi constructs that test ${CANNOT_DUMP}. - Edit out "|| exit ;\" constructs in emacs${EXEEXT} rule. + Delete lines in rules that invoke $(MKDEPDIR). Fix editing rules + that begin with "cd ../lisp". Edit out sh if-then-else-fi + constructs that test ${CANNOT_DUMP}. Edit out "|| exit ;\" + constructs in emacs${EXEEXT} rule. 2010-06-03 Dan Nicolaescu ------------------------------------------------------------ revno: 101894 committer: Dan Nicolaescu branch nick: trunk timestamp: Sat 2010-10-09 20:40:58 -0700 message: * lisp/vc/log-view.el (log-view-mode-map): Bind revert-buffer. diff: === modified file 'lisp/ChangeLog' --- lisp/ChangeLog 2010-10-10 01:45:45 +0000 +++ lisp/ChangeLog 2010-10-10 03:40:58 +0000 @@ -1,3 +1,7 @@ +2010-10-10 Dan Nicolaescu + + * vc/log-view.el (log-view-mode-map): Bind revert-buffer. + 2010-10-10 Daiki Ueno * epa.el (epa-passphrase-callback-function): Display filename === modified file 'lisp/vc/log-view.el' --- lisp/vc/log-view.el 2010-06-11 19:09:57 +0000 +++ lisp/vc/log-view.el 2010-10-10 03:40:58 +0000 @@ -128,6 +128,7 @@ (easy-mmode-defmap log-view-mode-map '(("z" . kill-this-buffer) ("q" . quit-window) + ("g" . revert-buffer) ("m" . log-view-toggle-mark-entry) ("e" . log-view-modify-change-comment) ("d" . log-view-diff)