# HG changeset patch
# User Oleksandr Gavenko <gavenkoa@gmail.com>
# Date 1265234657 -7200
# Node ID 1fee37963d5ad4b41f38b01a242938454b7c8fdb
# Parent  5009c3f4afef9cdfa079c2e27edbf10d555fd888# Parent  e93ff9360a513b6a467e8ac5084476e5cb5f10e2
merged

diff -r e93ff9360a51 -r 1fee37963d5a .emacs-my
--- a/.emacs-my	Wed Feb 03 23:58:36 2010 +0200
+++ b/.emacs-my	Thu Feb 04 00:04:17 2010 +0200
@@ -267,7 +267,7 @@
   (progn
     (prefer-coding-system 'cp1251-dos)
     (prefer-coding-system 'utf-8-unix)
-    (setq selection-coding-system 'ctext-with-extensions)
+    (setq selection-coding-system 'compound-text-with-extensions)
     (setq x-select-request-type '(UTF8_STRING COMPOUND_TEXT TEXT STRING))
     (modify-coding-system-alist 'process ".*" 'utf-8-unix)
     ))
@@ -661,6 +661,19 @@
        ("\\(=\\{7,\\}\\|<\\{7,\\}\\|>\\{7,\\}\\)" 1 'my-conflict-face t)
        ))))))
 
+;; (dolist (mode '(c-mode
+;;                 java-mode
+;;                 cperl-mode
+;;                 html-mode-hook
+;;                 css-mode-hook
+;;                 emacs-lisp-mode))
+;;   (font-lock-add-keywords mode
+;;                           '(("\\(XXX\\|FIXME\\|TODO\\)"
+;;                              1 font-lock-warning-face prepend))))
+
+;; ======================================================================
+;; communication
+
 ;; ----------------------------------------------------------------------
 ;; jabber.
 
@@ -823,6 +836,11 @@
 ;; (add-to-list 'compilation-mode-font-lock-keywords '("[ 	]\\(/F[oe][^ 	]+\\)" . 1))
 
 ;; ----------------------------------------------------------------------
+;; windows inf files for driver installing
+
+(add-to-list 'auto-mode-alist '("\\.inf\\'" . conf-mode))
+
+;; ----------------------------------------------------------------------
 ;; makefile, make.
 
 (add-to-list 'auto-mode-alist '("\\(Makefile\\|Makefile\\..+\\)\\'" . makefile-gmake-mode))
@@ -1076,10 +1094,11 @@
 
 ;; Size of emacs area and its position.
 (when window-system
-  ;; This size for 1280x1024 resolusion and 13pt font to occupy almost all screen.
   (run-at-time (format "%d sec" 1) nil '(lambda () (set-frame-position (selected-frame) 1 1)))
-  (run-at-time (format "%d sec" 2) nil '(lambda () (set-frame-width (selected-frame) 150 t)))
-  (run-at-time (format "%d sec" 3) nil '(lambda () (set-frame-height (selected-frame) 60 t)))
+  (when (boundp 'my-frame-width)
+    (run-at-time (format "%d sec" 2) nil '(lambda () (set-frame-width (selected-frame) my-frame-width t))) )
+  (when (boundp 'my-frame-height)
+    (run-at-time (format "%d sec" 3) nil '(lambda () (set-frame-height (selected-frame) my-frame-height t))) )
   )
 
 ;; End loading...
diff -r e93ff9360a51 -r 1fee37963d5a .emacs-pre
--- a/.emacs-pre	Wed Feb 03 23:58:36 2010 +0200
+++ b/.emacs-pre	Thu Feb 04 00:04:17 2010 +0200
@@ -1,3 +1,7 @@
 ;; -*- mode: lisp; coding: utf-8 -*-
 ;;
 ;; For loading order see README.
+
+;; Set frame width and heith. 150x46 for 13pt 1280x800, 150x60 for 13pt 1280x1024.
+;; (setq my-frame-width 150)
+;; (setq my-frame-height 60)
diff -r e93ff9360a51 -r 1fee37963d5a lisp/nsis-mode.el
--- a/lisp/nsis-mode.el	Wed Feb 03 23:58:36 2010 +0200
+++ b/lisp/nsis-mode.el	Thu Feb 04 00:04:17 2010 +0200
@@ -18,10 +18,46 @@
 
 ;;;###autoload
 (define-generic-mode 'nsis-mode
-  (list ?\;)
-  '("Section" "SectionEnd" "Function" "FunctionEnd" "Call" "Goto")
-  '(("!\\([A-Za-z]+\\)" (1 'font-lock-builtin-face))
+  (list ?\; ?\# '("/*" . "*/"))
+  '(
+    "Section" "SectionEnd" "SectionIn" "SectionGroup" "SectionGroupEnd" "Function" "FunctionEnd" "File"
+    "SectionSetFlags" "SectionGetFlags" "SectionSetText" "SectionGetText" "SectionSetInstTypes" "SectionGetInstTypes" "SectionSetSize" "SectionGetSize" "SetCurInstType" "GetCurInstType" "InstTypeSetText" "InstTypeGetText"
+    "Name" "ShowInstDetails" "Caption"
+    "LicenseText" "LicenseData" "LicenseForceSelection" "ComponentText" "BrandingText" "DetailsButtonText" "CompletedText" "UninstallText"
+    "DirText" "DirVar" "DirVerify"
+    "Exec" "ExecWait" "ExecShell" "Goto" "goto" "Call" "Return" "Abort" "Quit" "ClearErrors" "SetErrors"
+    "Reboot" "SetRebootFlag"
+    "IfSilent" "IfAbort" "IfRebootFlag" "IfErrors" "IfFileExists"
+    "GetCurrentAddress" "GetFunctionAddress" "GetLabelAddress"
+    "Page" "UninstPage" "PageEx" "PageCallbacks" "PageExEnd"
+    "Delete" "CopyFiles" "CreateDirectory" "RMDir" "OutFile" "ReserveFile" "CreateShortCut"
+    "CallInstDLL" "GetDLLVersion" "GetDLLVersionLocal" "RegDLL" "UnRegDLL"
+    "GetFileTime" "GetFileTimeLocal" "GetFullPathName" "GetTempFileName" "SearchPath" "SetFileAttributes"
+    "ReadRegStr" "WriteRegStr" "DeleteRegKey" "DeleteRegValue" "EnumRegKey" "EnumRegValue" "WriteRegDWORD" "ReadRegDWORD" "WriteRegDword" "WriteRegBin" "WriteRegDWORD" "WriteRegExpandStr"
+    "ExpandEnvStrings" "ReadEnvStr"
+    "DeleteINISec" "DeleteINIStr" "FlushINI" "ReadINIStr" "WriteINIStr"
+    "Var" "Pop" "Push" "Exch"
+    "StrLen" "StrCpy" "StrCmp" "StrCmpS" "IntCmp" "IntCmpU" "IntFmt" "IntOp"
+    "FileClose" "FileOpen" "FileRead" "FileReadByte" "FileSeek" "FileWrite" "FileWriteByte" "FindClose" "FindFirst" "FindNext"
+    "InitPluginsDir" "addplugindir" "InstallDir" "InstallDirRegKey" "InstType" "Nop" "Sleep"
+    "RequestExecutionLevel" "CRCCheck" "XPStyle"
+    "ReadIniStr" "WriteIniStr"
+    "LogSet" "LogText"
+    "Icon" "UninstallIcon"
+    "SendMessage" "MessageBox" "GetDlgItem"
+    "FindWindow" "EnableWindow" "LockWindow" "ShowWindow" "HideWindow" "IsWindow" "AutoCloseWindow"
+    "SetAutoClose" "CreateFont" "SetCtlColors" "SetBrandingImage" "SetDetailsView" "SetDetailsPrint" "SetSilent" "BringToFront" "DetailPrint"
+    "LoadLanguageFile" "LangString" "LicenseLangString"
+    "SubCaption" "UninstallSubCaption"
+    "SetPluginUnload" "DetailPrint" "SetOutPath" "WriteUninstaller"
+    "GetErrorLevel" "SetErrorLevel" "GetInstDirError" "SetRegView" "SetShellVarContext"
+    "SetDateSave" "SetDatablockOptimize" "BGGradient" "InstallColors" "CheckBitmap" "SilentInstall" "SetOverwrite"
+    "SetCompress"
+    )
+  '(
+    ("!\\(insertmacro\\|define\\|ifdef\\|ifndef\\|else\\|endif\\|echo\\|verbose\\|include\\|macroend\\|macro\\|undef\\|packhdr\\|warning\\|error\\)" (1 'font-lock-builtin-face))
     ("$[({]?\\([A-Za-z0-9_]+\\)[)}]?" (1 'font-lock-variable-name-face))
+    ("^[[:blank:]]*\\([[:alpha:]][[:alnum:]_.]*:\\)\\([^:]\\|$\\)" (1 'font-lock-function-name-face))
     )
   (list "\\.\\(nsi\\|nsh\\)$")
   nil