diff --git a/modules/webhelp/web/hacking/cdsware.el b/modules/webhelp/web/hacking/cdsware.el
index e983d1e69..9f70d8e9b 100644
--- a/modules/webhelp/web/hacking/cdsware.el
+++ b/modules/webhelp/web/hacking/cdsware.el
@@ -1,60 +1,69 @@
 ;;; cdsware.el -- CDS Invenio-related Emacs definitions people may find useful.
 ;;; $Id$
 ;;;
 ;;; This file is part of CDS Invenio.
 ;;; Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007 CERN.
 ;;;
 ;;; CDS Invenio is free software; you can redistribute it and/or
 ;;; modify it under the terms of the GNU General Public License as
 ;;; published by the Free Software Foundation; either version 2 of the
 ;;; License, or (at your option) any later version.
 ;;;
 ;;; CDS Invenio is distributed in the hope that it will be useful, but
 ;;; WITHOUT ANY WARRANTY; without even the implied warranty of
 ;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-;;; General Public License for more details.  
+;;; General Public License for more details.
 ;;;
 ;;; You should have received a copy of the GNU General Public License
 ;;; along with CDS Invenio; if not, write to the Free Software Foundation, Inc.,
 ;;; 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
 
 ;; switch off the beep
 (setq visible-bell t)
 
 ;; spaces instead of tabs:
 (setq-default indent-tabs-mode nil)
 
 ;; no newlines at the end:
 (setq next-line-add-newlines nil)
 
 ;; fancy parens and such:
 (set-scroll-bar-mode 'right)
 (setq blink-cursor nil)
 (setq transient-mark-mode t)
 (show-paren-mode t)
 
 ;; light yellow on dark green is cool:
 (when (locate-library "color-theme")
     (require 'color-theme)
     (color-theme-gnome2))
 
 ;; setting color-syntax highlighting:
 (require 'font-lock)
 (global-font-lock-mode t)
 (setq-default font-lock-auto-fontify t)
 
 ;; fancy Python mode:
 (when (locate-library "ipython")
   (require 'ipython))
 
 ;; most WML files in CDS Invenio are Python files
 (setq auto-mode-alist (cons '("\\.wml$" . python-mode) auto-mode-alist))
 
 ;; Pythonic things:
 (autoload 'python-mode "python-mode" "Python editing mode." t)
 (setq interpreter-mode-alist (cons '("python" . python-mode) interpreter-mode-alist))
 
 ;; choosing version control software:
 (setq vc-default-back-end 'CVS)
 
+;; warn about trailing whitespaces:
+(mapc (lambda (hook)
+	(add-hook hook (lambda ()
+			 (setq show-trailing-whitespace t))))
+      '(text-mode-hook
+	emacs-lisp-mode-hook
+	python-mode-hook
+	shell-script-mode-hook))
+
 ;;; end of file
\ No newline at end of file