equal
deleted
inserted
replaced
246 (require 'server) |
246 (require 'server) |
247 (when (and (= emacs-major-version 23) (>= emacs-minor-version 1) (<= emacs-minor-version 2) (equal window-system 'w32)) |
247 (when (and (= emacs-major-version 23) (>= emacs-minor-version 1) (<= emacs-minor-version 2) (equal window-system 'w32)) |
248 (defun server-ensure-safe-dir (dir) "Noop" t)) ; Suppress error directory ~/.emacs.d/server is unsafe on windows. |
248 (defun server-ensure-safe-dir (dir) "Noop" t)) ; Suppress error directory ~/.emacs.d/server is unsafe on windows. |
249 (unless (or (<= emacs-major-version 22) (server-running-p server-name)) |
249 (unless (or (<= emacs-major-version 22) (server-running-p server-name)) |
250 (server-start)) |
250 (server-start)) |
251 ) |
|
252 |
|
253 ;;; ---------------------------------------------------------------- |
|
254 ;; Save and restore my buffers every time. |
|
255 (setq desktop-dirname "~/.emacs.d") |
|
256 (when (>= emacs-major-version 22) |
|
257 (desktop-save-mode 1) |
|
258 ) |
251 ) |
259 |
252 |
260 ;;; ---------------------------------------------------------------- |
253 ;;; ---------------------------------------------------------------- |
261 (message "standart/general settings") |
254 (message "standart/general settings") |
262 |
255 |
1460 )) |
1453 )) |
1461 |
1454 |
1462 ;;; ---------------------------------------------------------------- |
1455 ;;; ---------------------------------------------------------------- |
1463 (message "javascript, js") |
1456 (message "javascript, js") |
1464 |
1457 |
1465 (if (>= emacs-major-version 23) |
1458 ;; (if (>= emacs-major-version 23) |
1466 (add-to-list 'auto-mode-alist '("\\.js$" . js-mode)) |
1459 ;; (add-to-list 'auto-mode-alist '("\\.js$" . js-mode)) |
1467 (add-to-list 'auto-mode-alist '("\\.js$" . javascript-generic-mode)) |
1460 ;; (add-to-list 'auto-mode-alist '("\\.js$" . javascript-generic-mode)) |
1468 ) |
1461 ;; ) |
|
1462 |
|
1463 (setq auto-mode-alist (rassq-delete-all 'js-mode auto-mode-alist)) |
|
1464 (add-to-list 'auto-mode-alist '("\\.js$" . c++-mode)) |
1469 |
1465 |
1470 ;;; ---------------------------------------------------------------- |
1466 ;;; ---------------------------------------------------------------- |
1471 (message "bat file, batch") |
1467 (message "bat file, batch") |
1472 |
1468 |
1473 ;; loaded from 'generic-x.el' |
1469 ;; loaded from 'generic-x.el' |
1613 (setq auto-save-interval 300) |
1609 (setq auto-save-interval 300) |
1614 ;; Note: if you kill unsaved file auto save file not deleted. |
1610 ;; Note: if you kill unsaved file auto save file not deleted. |
1615 (setq delete-auto-save-files t) |
1611 (setq delete-auto-save-files t) |
1616 |
1612 |
1617 ;;; ---------------------------------------------------------------- |
1613 ;;; ---------------------------------------------------------------- |
|
1614 ;; Save and restore my buffers every time. |
|
1615 (setq desktop-dirname "~/.emacs.d") |
|
1616 (when (>= emacs-major-version 22) |
|
1617 (desktop-save-mode 1) |
|
1618 ) |
|
1619 |
|
1620 ;;; ---------------------------------------------------------------- |
1618 (message "User welcome msg") |
1621 (message "User welcome msg") |
1619 |
1622 |
1620 (add-hook 'emacs-startup-hook |
1623 (add-hook 'emacs-startup-hook |
1621 (lambda () |
1624 (lambda () |
1622 (let ( (mgs-list '("Welcome to emacs, the thermonuclear editor." |
1625 (let ( (mgs-list '("Welcome to emacs, the thermonuclear editor." |