projects
/
elisp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update.
[elisp.git]
/
emacs.el
diff --git
a/emacs.el
b/emacs.el
index
bf6da94
..
aea32d6
100644
(file)
--- a/
emacs.el
+++ b/
emacs.el
@@
-34,9
+34,9
@@
;; (set-default-font "Bitstream vera sans mono-12")
;; (set-default-font "Liberation Mono-13")
(set-default-font "Inconsolata 15")
;; (set-default-font "Bitstream vera sans mono-12")
;; (set-default-font "Liberation Mono-13")
(set-default-font "Inconsolata 15")
-;;(set-default-font "DejaVu sans mono 11")
-;;(set-default-font "Droid sans mono 13")
-;;(set-default-font "Opensans 10")
+;;
(set-default-font "DejaVu sans mono 11")
+;;
(set-default-font "Droid sans mono 13")
+;;
(set-default-font "Opensans 10")
(when (fboundp 'horizontal-scroll-bar-mode)
(horizontal-scroll-bar-mode -1))
(when (fboundp 'horizontal-scroll-bar-mode)
(horizontal-scroll-bar-mode -1))
@@
-328,6
+328,8
@@
load-warning buffer in case of failure."
;; What modes for what file extentions
(add-to-list 'auto-mode-alist '("\\.h\\'" . c++-mode))
;; What modes for what file extentions
(add-to-list 'auto-mode-alist '("\\.h\\'" . c++-mode))
+(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))
+
(require 'org-table)
(add-to-list 'auto-mode-alist '("\\.txt\\'" . (lambda()
(require 'org-table)
(add-to-list 'auto-mode-alist '("\\.txt\\'" . (lambda()
@@
-854,7
+856,11
@@
printer."
(defun ff/sum-values-from-files (list-files prefix)
(apply '+
(mapcar
(defun ff/sum-values-from-files (list-files prefix)
(apply '+
(mapcar
- (lambda (f) (string-to-number (ff/file-first-line (format "%s/%s" f prefix))))
+ (lambda (f)
+ (condition-case nil
+ (string-to-number (ff/file-first-line (format "%s/%s" f prefix)))
+ (error 0))
+ )
list-files)))
(defun ff/battery-percent ()
list-files)))
(defun ff/battery-percent ()
@@
-890,7
+896,7
@@
printer."
(pcase (ff/battery-state ff/battery-dirs)
(`charging (format "c%d%%" (ff/battery-percent)))
(`discharging (format "d%d%%" (ff/battery-percent)))
(pcase (ff/battery-state ff/battery-dirs)
(`charging (format "c%d%%" (ff/battery-percent)))
(`discharging (format "d%d%%" (ff/battery-percent)))
- (
code
"f"))
+ (
_
"f"))
)
)
@@
-925,7
+931,7
@@
printer."
)
'(
)
'(
- ("hostname" nil t nil "-
v
")
+ ("hostname" nil t nil "-
f
")
("acpi" nil t)
("df" nil t nil "-h")
;; ("mount" nil t)
("acpi" nil t)
("df" nil t nil "-h")
;; ("mount" nil t)
@@
-1706,7
+1712,7
@@
int main(int argc, char **argv) {
<head>
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />
<title></title>
<head>
<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" />
<title></title>
-<style>
+<style
type=\"text/css\"
>
p {
color:#009900;
}
p {
color:#009900;
}
@@
-2202,19
+2208,19
@@
This may be a useful alternative binding for \\[delete-other-windows]
;; (define-key global-map [(control shift next)] 'previous-multiframe-window)
;; I have two screens sometime!
;; (define-key global-map [(control shift next)] 'previous-multiframe-window)
;; I have two screens sometime!
+;; (define-key global-map [(meta next)] 'other-frame)
+;; (define-key global-map [(meta prior)] (lambda () (interactive) (other-frame -1)))
-(define-key global-map [(meta next)] 'other-frame)
-(define-key global-map [(meta prior)] (lambda () (interactive) (other-frame -1)))
-
-(define-key global-map [(shift home)] 'delete-other-windows-vertically)
+;; (load "winner")
+(winner-mode 1)
+(define-key global-map [(shift backspace)] 'winner-undo)
+;; (define-key global-map [(shift home)] 'delete-other-windows-vertically)
;; (define-key global-map [(control +)] 'enlarge-window)
;; (define-key global-map [(control -)] 'shrink-window)
;; (define-key global-map [(control +)] 'enlarge-window)
;; (define-key global-map [(control -)] 'shrink-window)
-
;; Goes to next/previous buffer
;; Goes to next/previous buffer
-
-(define-key global-map [(control prior)] 'ff/next-buffer)
-(define-key global-map [(control next)] 'ff/prev-buffer)
+;; (define-key global-map [(control prior)] 'ff/next-buffer)
+;; (define-key global-map [(control next)] 'ff/prev-buffer)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; If M-. on a symbol, show where it is defined in another window
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; If M-. on a symbol, show where it is defined in another window
@@
-2262,7
+2268,7
@@
next one. With universal argument, kill all killable buffers."
(if (string-match ff/kill-this-buffer-and-delete-window-exceptions (buffer-name))
(ff/next-buffer)
(kill-this-buffer)))
(if (string-match ff/kill-this-buffer-and-delete-window-exceptions (buffer-name))
(ff/next-buffer)
(kill-this-buffer)))
-
;;
(unless (one-window-p t) (delete-window))
+ (unless (one-window-p t) (delete-window))
)
(define-key global-map [(control backspace)] 'ff/kill-this-buffer-and-delete-window)
)
(define-key global-map [(control backspace)] 'ff/kill-this-buffer-and-delete-window)