el/dot-emacs.el: Remove further stray debugging code.

[profile] / dot / emacs

diff --git a/dot/emacs b/dot/emacs
index 5b37d8b..708817f 100644 (file)
--- a/dot/emacs
+++ b/dot/emacs
@@ -328,6 +328,7 @@
 
 (setq display-time-24hr-format t)
 (display-time)
+(column-number-mode 1)
 (trap
   (if window-system
       (let ((view-diary-entries-initially t))
@@ -381,14 +382,12 @@
         (cursor-color . "red"))
        (if mdw-black-background
           '((background-mode . dark))
-        '((background-mode . light)))
-       (and (eq window-system 'x)
-           '((font . "6x13")))
-       (and (eq window-system 'pm)
-           '((font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
-             (menu-font . "8.Helv")
-             (background-color . "lightgrey")))
-       default-frame-alist))
+        '((background-mode . light)))))
+(setq window-system-default-frame-alist
+      '((pm (font . "-os2-System VIO-medium-r-normal--*-40-*-*-m-*-cp850")
+           (menu-font . "8.Helv")
+           (background-color . "lightgrey"))
+       (nil (menu-bar-lines . 0))))
 
 ;; Other frame fiddling.
 
@@ -501,6 +500,13 @@
 
 (setq completion-ignored-extensions
       (append `(".hc" ".hi") completion-ignored-extensions))
+(dolist (dir (remove-if-not (lambda (ext)
+                             (= (aref ext (- (length ext) 1)) ?/))
+                           completion-ignored-extensions))
+  (if (/= (aref dir 0) ?/)
+      (setq completion-ignored-extensions
+           (cons (concat "/" dir)
+                 (remove dir completion-ignored-extensions)))))
 
 ;; Some common local definitions.