el/dot-emacs.el: Turn on `smerge-mode' if we see conflict markers.

[profile] / Makefile

diff --git a/Makefile b/Makefile
index 8c0aa48..09d911a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -64,13 +64,25 @@ _force:
 ###--------------------------------------------------------------------------
 ### Emacs.
 
+ifneq ($(EMACS),nil)
+
 EMACSLIB                = $(HOME)/lib/emacs
 
+EMACS_VERSION          := $(shell $(EMACS) 2>&1 -Q --batch --eval \
+       '(message "%s %s" emacs-major-version emacs-minor-version)')
+emacs-version-p                 = $(shell set -- $(EMACS_VERSION); \
+       if [ $$1 -gt $1 ] || ([ $$1 -eq $1 ] && [ $$2 -ge $2 ]); then \
+         echo t; \
+       fi)
+
 ELISP                  += make-regexp ew-hols
 ELISP                  += mdw-gnus-patch
 ELISP                  += mdw-multiple-cursors
 ELISP                  += git git-blame vc-git stgit quilt
+
+ifeq ($(call emacs-version-p,24,3),t)
 ELISP                  += bracketed-paste
+endif
 
 ELISP                  += dot-emacs
 dot-emacs_DEPS          = make-regexp
@@ -118,6 +130,8 @@ DOTLINKS            += .emacs .emacs-calc .vm .gnus.el .ercrc.el
 all:: $(foreach e, $(ELISP), $(DEP_$e))
 $(foreach e, $(ELISP), $(eval _emacs.$e: $(EMACSLIB)/$e.elc))
 
+endif
+
 ###--------------------------------------------------------------------------
 ### Other simpler things.
 
@@ -137,13 +151,17 @@ SCRIPTLINKS               += update-buildable-branch
 ## Shells.
 DOTLINKS               += .profile .shell-rc .shell-logout
 DOTLINKS               += .shrc .rcrc
-DOTLINKS               += .zprofile .zshrc .zshenv
-DOTLINKS               += .bash_profile .bash_completion .bashrc .inputrc
+DOTLINKS               += .zprofile .zshrc .zlogout .zshenv
+DOTLINKS               += .bash_profile .bash_completion .bash_logout
+DOTLINKS               += .bashrc .inputrc
 .bash_profile_SRC       = bash-profile
 .bash_completion_SRC    = bash-completion
+.bash_logout_SRC        = shell-logout
+.zlogout_SRC            = shell-logout
 
 ## Git.
 DOTSUBST               += .gitconfig
+SCRIPTLINKS            += git-copyright-dates
 DOTLINKS               += .cgrc .tigrc
 .gitconfig_SUBSTS       = \
        $(call substvar,releasekey,$(call mdw-conf,release-key,481334C2))