diff --git a/.emacs.d/mode-cc.el b/.emacs.d/mode-cc.el
index a08b010b..ec4c0028 100644
--- a/.emacs.d/mode-cc.el
+++ b/.emacs.d/mode-cc.el
@@ -1,6 +1,7 @@
 ;;==============================================================================
 ;; C/C++
 ;;==============================================================================
+;; Note: maybe this should be split in mode-c and mode-c++.
 
 (defcustom cc-ldlibs "-lm -pthread"
   "Custom linker flags for C/C++ linkage."
diff --git a/.emacs.d/mode-tex.el b/.emacs.d/mode-tex.el
index dbb7ed18..a4b8ca7a 100644
--- a/.emacs.d/mode-tex.el
+++ b/.emacs.d/mode-tex.el
@@ -67,18 +67,20 @@ WARNING: the -shell-escape option is a potential security issue."
 but there is no warranty."
   (interactive)
   (hack-local-variables)
-  (let* ((local-master (if (not masterfile) buffer-file-name masterfile)))
-    ;; Concatate file name to list.
+  (let ((master (concat
+                 (if masterfile
+                     (file-name-sans-extension masterfile)
+                   (file-name-sans-extension buffer-file-name))
+                 ".")))
     (mapcar
-     ;; Delete file if exist
-     (lambda (argfile) (interactive)
-       (if (not (and (file-exists-p argfile) (file-writable-p argfile)))
-           (message "[%s] not found." argfile)
+     ;; Delete file if it exists.
+     (lambda (argfile)
+       (when (and (file-exists-p argfile) (file-writable-p argfile))
          (delete-file argfile)
          (message "[%s] deleted." argfile)))
      (mapcar
       ;; Concat file name with extensions.
-      (lambda (arg) (interactive) (concat file arg))
+      (lambda (arg) (concat master arg))
       tex-extension-list))))
 
 (defun tex-pdf-compress ()