From 7e27526eca7e98c14ed22b80c4fee08520906bc7 Mon Sep 17 00:00:00 2001 From: doty Date: Wed, 9 Jan 2019 10:06:33 -0800 Subject: [PATCH] Don't remember why but I don't like this Summary: Test Plan: Reviewers: Subscribers: Tasks: Tags: --- .config/htop/htoprc | 2 +- .emacs.d/core.el | 106 ++++++++++++++++++++++---------------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/.config/htop/htoprc b/.config/htop/htoprc index a1c6722..285dac4 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -1,6 +1,6 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # The parser is also very primitive, and not human-friendly. -fields=0 48 17 18 38 39 2 46 47 49 1 +fields=0 48 17 18 38 39 2 46 47 49 1 0 sort_key=46 sort_direction=1 hide_threads=0 diff --git a/.emacs.d/core.el b/.emacs.d/core.el index 485953f..345a311 100644 --- a/.emacs.d/core.el +++ b/.emacs.d/core.el @@ -787,68 +787,68 @@ ;; Some build stuff; I swiped this from handmade-hero. Good for ;; unibuild setups. ;; ================================================================= -(when (featurep 'w32) - (setq doty-makescript "build.bat")) +;; (when (featurep 'w32) +;; (setq doty-makescript "build.bat")) -(when (featurep 'cocoa) - (setq doty-makescript "./build.macosx")) +;; (when (featurep 'cocoa) +;; (setq doty-makescript "./build.macosx")) -(when (featurep 'x) - (setq doty-makescript "./build.linux")) +;; (when (featurep 'x) +;; (setq doty-makescript "./build.linux")) -(setq compilation-directory-locked nil) -(setq compilation-context-lines 0) -(setq compilation-error-regexp-alist - (cons '("^\\([0-9]+>\\)?\\(\\(?:[a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\)) : \\(?:fatal error\\|warnin\\(g\\)\\) C[0-9]+:" 2 3 nil (4)) - compilation-error-regexp-alist)) +;; (setq compilation-directory-locked nil) +;; (setq compilation-context-lines 0) +;; (setq compilation-error-regexp-alist +;; (cons '("^\\([0-9]+>\\)?\\(\\(?:[a-zA-Z]:\\)?[^:(\t\n]+\\)(\\([0-9]+\\)) : \\(?:fatal error\\|warnin\\(g\\)\\) C[0-9]+:" 2 3 nil (4)) +;; compilation-error-regexp-alist)) -(defun find-project-directory-recursive () - "Recursively search for a makefile." - (interactive) - (if (file-exists-p doty-makescript) t - (cd "../") - (find-project-directory-recursive))) +;; (defun find-project-directory-recursive () +;; "Recursively search for a makefile." +;; (interactive) +;; (if (file-exists-p doty-makescript) t +;; (cd "../") +;; (find-project-directory-recursive))) -(defun lock-compilation-directory () - "The compilation process should NOT hunt for a makefile." - (interactive) - (setq compilation-directory-locked t) - (message "Compilation directory is locked.")) +;; (defun lock-compilation-directory () +;; "The compilation process should NOT hunt for a makefile." +;; (interactive) +;; (setq compilation-directory-locked t) +;; (message "Compilation directory is locked.")) -(defun unlock-compilation-directory () - "The compilation process SHOULD hunt for a makefile." - (interactive) - (setq compilation-directory-locked nil) - (message "Compilation directory is roaming.")) +;; (defun unlock-compilation-directory () +;; "The compilation process SHOULD hunt for a makefile." +;; (interactive) +;; (setq compilation-directory-locked nil) +;; (message "Compilation directory is roaming.")) -(defun find-project-directory () - "Find the project directory." - (interactive) - (setq find-project-from-directory default-directory) - (switch-to-buffer-other-window "*compilation*") - (if compilation-directory-locked (cd last-compilation-directory) - (cd find-project-from-directory) - (find-project-directory-recursive) - (setq last-compilation-directory default-directory))) +;; (defun find-project-directory () +;; "Find the project directory." +;; (interactive) +;; (setq find-project-from-directory default-directory) +;; (switch-to-buffer-other-window "*compilation*") +;; (if compilation-directory-locked (cd last-compilation-directory) +;; (cd find-project-from-directory) +;; (find-project-directory-recursive) +;; (setq last-compilation-directory default-directory))) -(defun make-without-asking () - "Make the current build." - (interactive) - (if (find-project-directory) (compile doty-makescript)) - (other-window 1)) -(define-key global-map "\C-c\C-m" 'make-without-asking) +;; (defun make-without-asking () +;; "Make the current build." +;; (interactive) +;; (if (find-project-directory) (compile doty-makescript)) +;; (other-window 1)) +;; (define-key global-map "\C-c\C-m" 'make-without-asking) -(defun set-vs-environment () - "Load the VS environment variables into the current Emacs process." - (interactive) - (dolist - (ev (split-string - (shell-command-to-string "cmd /c \" \"%ProgramFiles(x86)%\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat\" x64 && set \"") - "[\n]+")) - (letrec ((spev (split-string ev "=")) - (vn (car spev)) - (vv (cadr spev))) - (setenv vn vv)))) +;; (defun set-vs-environment () +;; "Load the VS environment variables into the current Emacs process." +;; (interactive) +;; (dolist +;; (ev (split-string +;; (shell-command-to-string "cmd /c \" \"%ProgramFiles(x86)%\\Microsoft Visual Studio 14.0\\VC\\vcvarsall.bat\" x64 && set \"") +;; "[\n]+")) +;; (letrec ((spev (split-string ev "=")) +;; (vn (car spev)) +;; (vv (cadr spev))) +;; (setenv vn vv)))) ;; =================================================================