Merge remote branch 'crybaby'

* crybaby:
  dot/emacs: Mark the `edit-server' process as expendable.

diff --git a/dot/e16-bindings b/dot/e16-bindings
index cd3a00309492df8a81532fdf0f590335b4b6eb96..978182676f27bb7363dca0c3f11de3d03cd8e749 100644 (file)
--- a/dot/e16-bindings
+++ b/dot/e16-bindings
@@ -51,6 +51,7 @@ KeyDown   C5        s wop * stick
 KeyDown   C5        v wop * th available
 KeyDown   C5        w menus show winops.menu
 KeyDown   C5        x wop * close
+KeyDown   C5        z wop * zoom
 KeyDown   C5       F1 menus show file.menu
 KeyDown   C5       F2 menus show enlightenment.menu
 KeyDown   C5       F3 menus show settings.menu

diff --git a/dot/emacs b/dot/emacs
index ea038b8a4374da4c456986b879ac7e07ec172622..65f558f1ea7f09a31154697ae9b360d2f1156308 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -275,6 +275,7 @@
 (setq url-cookie-untrusted-urls '("."))
 
 (setq browse-url-browser-function (mdw-good-url-browser)
+      browse-url-generic-program "mdw-chrome"
       browse-url-mozilla-program "firefox")
 
 (setq w3m-default-display-inline-images t)

diff --git a/el/dot-emacs.el b/el/dot-emacs.el
index c344a3101a232c210e0f7f33661dfd832ca3ca69..dc4b041c73de5762c30fdcf8db974139f8c5324b 100644 (file)
--- a/el/dot-emacs.el
+++ b/el/dot-emacs.el
@@ -516,7 +516,8 @@ (defun mdw-w3m-browse-url (url &optional new-session-p)
        (select-window window)))))
 
 (defvar mdw-good-url-browsers
-  '((w3m . mdw-w3m-browse-url)
+  '(browse-url-generic
+    (w3m . mdw-w3m-browse-url)
     browse-url-w3
     browse-url-mozilla)
   "List of good browsers for mdw-good-url-browsers.
@@ -2180,7 +2181,6 @@ (defun messages-mode ()
   (modify-syntax-entry ?\n ">" messages-mode-syntax-table)
   (setq comment-start "# ")
   (setq comment-end "")
-  (turn-on-font-lock-if-enabled)
   (run-hooks 'messages-mode-hook))
 
 (defun cpp-messages-mode ()
@@ -2207,7 +2207,6 @@ (defun cpp-messages-mode ()
                                      "\\)\\>\\|[0-9]+\\|$\\)\\)")
                              '(1 font-lock-keyword-face)))
                  messages-mode-keywords)))
-  (turn-on-font-lock-if-enabled)
   (run-hooks 'cpp-messages-mode-hook))
 
 (add-hook 'messages-mode-hook 'mdw-misc-mode-config t)
@@ -2258,7 +2257,6 @@ (defun mallow-driver-mode ()
   (modify-syntax-entry ?\n ">" mallow-driver-mode-syntax-table)
   (setq comment-start "%# ")
   (setq comment-end "")
-  (turn-on-font-lock-if-enabled)
   (run-hooks 'mallow-driver-mode-hook))
 
 (add-hook 'mallow-driver-hook 'mdw-misc-mode-config t)
@@ -2301,7 +2299,6 @@ (defun nfast-debug-mode ()
         '("\\(\\s.\\|\\s(\\|\\s)\\|\\s\\\\|\\s/\\)" (0 mdw-punct-face))))
   (setq font-lock-defaults
        '(nfast-debug-mode-keywords nil nil nil nil))
-  (turn-on-font-lock-if-enabled)
   (run-hooks 'nfast-debug-mode-hook))
 
 ;;;--------------------------------------------------------------------------