5 files changed, 20 insertions, 3 deletions
diff --git a/emacs/.emacs.d/init/ycp-editing.el b/emacs/.emacs.d/init/ycp-editing.el
index b86139e..a26cee0 100644
--- a/emacs/.emacs.d/init/ycp-editing.el
+++ b/emacs/.emacs.d/init/ycp-editing.el
@@ -28,8 +28,7 @@
 
 
 ;; line wrap at window edge
-(set-default 'truncate-lines nil)
-
+(setq-default truncate-lines nil)
 (setq kill-do-not-save-duplicates t)
 (setq bidi-inhibit-bpa t)
 (setq save-interprogram-paste-before-kill t)
diff --git a/emacs/.emacs.d/init/ycp-prog.el b/emacs/.emacs.d/init/ycp-prog.el
index 222e912..054b035 100644
--- a/emacs/.emacs.d/init/ycp-prog.el
+++ b/emacs/.emacs.d/init/ycp-prog.el
@@ -521,12 +521,13 @@
   (:delay 5)
   (setq which-func-modes
         '(org-mode c-mode c++-mode bison-mode shell-script-mode emacs-lisp-mode
-                   sql-mode json-mode))
+                   sql-mode json-mode js-mode))
   (which-function-mode)
   (add-hook 'org-mode-hook 'my-set-header-line-to-which-func)
   (add-hook 'c-mode-hook 'my-set-header-line-to-which-func)
   (add-hook 'emacs-lisp-mode-hook 'my-set-header-line-to-which-func)
   (add-hook 'c++-mode-hook 'my-set-header-line-to-which-func)
+  (add-hook 'js-mode-hook 'my-set-header-line-to-which-func)
   )
 
 ;;; nxml
diff --git a/emacs/.emacs.d/init/ycp-vc.el b/emacs/.emacs.d/init/ycp-vc.el
index 16261b6..e3399be 100644
--- a/emacs/.emacs.d/init/ycp-vc.el
+++ b/emacs/.emacs.d/init/ycp-vc.el
@@ -116,6 +116,7 @@
   (require 'magit-diff)
   (setq magit-diff-refine-hunk t)
   (setq magit-diff-adjust-tab-width t)
+  (add-hook 'magit-diff-mode-hook #'my-turn-off-truncate-lines)
 
   (require 'magit-repos)
   (my-setq-from-local magit-repository-directories)
diff --git a/emacs/.emacs.d/init/ycp-web.el b/emacs/.emacs.d/init/ycp-web.el
index bd6ca93..a81c2b0 100644
--- a/emacs/.emacs.d/init/ycp-web.el
+++ b/emacs/.emacs.d/init/ycp-web.el
@@ -189,4 +189,17 @@
   (:delay 60)
   (my-setq-from-local my-scihub-host))
 
+(my-package w3m
+  (:delay 60)
+  (my-keybind w3m-mode-map
+    "o" #'w3m-browse-url
+    "n" #'scroll-up-line
+    "p" #'scroll-down-line
+    "w" #'w3m-print-this-url
+    "l" #'w3m-view-previous-page
+    "r" #'w3m-view-next-page
+    "g" #'w3m-reload-this-page
+    )
+  (require 'w3m-load))
+
 (provide 'ycp-web)
diff --git a/emacs/.emacs.d/lisp/my/my-editing.el b/emacs/.emacs.d/lisp/my/my-editing.el
index 19043ff..2c1abfb 100644
--- a/emacs/.emacs.d/lisp/my/my-editing.el
+++ b/emacs/.emacs.d/lisp/my/my-editing.el
@@ -519,5 +519,8 @@ With an prefix-arg, copy the file name relative to project root."
   (let ((search-invisible t))
     (apply old-fun r)))
 
+(defun my-turn-off-truncate-lines ()
+  (setq truncate-lines nil))
+
 (provide 'my-editing)
 ;;; my-editing.el ends here